summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2011-04-18 15:18:02 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2011-04-18 16:40:06 -0700
commitb1e7734f024c9ce4393016a97c8d821e1f18d9b4 (patch)
tree4e18708f8b70f02e85fd43741d0bc379466da992 /arch
parentce9c99af8d4b3b0b9463654fd252d8640d804dc3 (diff)
downloadlinux-stable-b1e7734f024c9ce4393016a97c8d821e1f18d9b4.tar.gz
linux-stable-b1e7734f024c9ce4393016a97c8d821e1f18d9b4.tar.bz2
linux-stable-b1e7734f024c9ce4393016a97c8d821e1f18d9b4.zip
x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4
For use in assembly constants, use the ASM_NOP* defines. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Tejun Heo <tj@kernel.org> Link: http://lkml.kernel.org/r/1303166160-10315-2-git-send-email-hpa@linux.intel.com
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/asm/percpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index d475b4398d8b..751e7f3f705c 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -517,7 +517,7 @@ do { \
typeof(o2) __o2 = o2; \
typeof(o2) __n2 = n2; \
typeof(o2) __dummy; \
- alternative_io("call this_cpu_cmpxchg16b_emu\n\t" P6_NOP4, \
+ alternative_io("call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP4, \
"cmpxchg16b " __percpu_prefix "(%%rsi)\n\tsetz %0\n\t", \
X86_FEATURE_CX16, \
ASM_OUTPUT2("=a"(__ret), "=d"(__dummy)), \