From: Linus Torvalds Date: Tue, 24 May 2011 18:53:42 +0000 (-0700) Subject: Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu X-Git-Tag: v3.0-rc1~315 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f Merge branch 'for-2.6.40' of git://git./linux/kernel/git/tj/percpu * 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: percpu: Unify input section names percpu: Avoid extra NOP in percpu_cmpxchg16b_double percpu: Cast away printk format warning percpu: Always align percpu output section to PAGE_SIZE Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun --- 5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f diff --cc arch/x86/include/asm/percpu.h index 53278b0dfdf6,d68fca61ad91..a0a9779084d1 --- 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; \