linux-next: manual merge of the akpm tree with the powerpc tree

Stephen Rothwell sfr at
Tue Aug 2 13:39:54 AEST 2016

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:


between commit:

  e3f91083facb ("jump_label: Make it possible for arches to invoke jump_label_init() earlier")

from the powerpc tree and patch:

   "jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL"

from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Stephen Rothwell

diff --cc kernel/jump_label.c
index 85b7105fdd86,20400055f177..000000000000
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@@ -235,9 -279,15 +279,18 @@@ void __init jump_label_init(void
  	struct static_key *key = NULL;
  	struct jump_entry *iter;
+ 	/*
+ 	 * Since we are initializing the static_key.enabled field with
+ 	 * with the 'raw' int values (to avoid pulling in atomic.h) in
+ 	 * jump_label.h, let's make sure that is safe. There are only two
+ 	 * cases to check since we initialize to 0 or 1.
+ 	 */
+ 	BUILD_BUG_ON((int)ATOMIC_INIT(0) != 0);
+ 	BUILD_BUG_ON((int)ATOMIC_INIT(1) != 1);
 +	if (static_key_initialized)
 +		return;
  	jump_label_sort_entries(iter_start, iter_stop);

More information about the Linuxppc-dev mailing list