linux-next: manual merge of the percpu tree with the tip tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/x86/include/asm/percpu.h between commit b1e7734f024c ("x86, percpu:
Use ASM_NOP4 instead of hardcoding P6_NOP4") from the tip tree and commit
5f55924deaa6 ("percpu: Avoid extra NOP in percpu_cmpxchg16b_double") from
the percpu tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/include/asm/percpu.h
index 53278b0,d68fca6..0000000
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@@ -509,6 -509,11 +509,11 @@@ do {									
   * it in software.  The address used in the cmpxchg16 instruction must be
   * aligned to a 16 byte boundary.
   */
+ #ifdef CONFIG_SMP
 -#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" P6_NOP3
++#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP3
+ #else
 -#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" P6_NOP2
++#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP2
+ #endif
  #define percpu_cmpxchg16b_double(pcp1, o1, o2, n1, n2)			\
  ({									\
  	char __ret;							\
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/