x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

H. Peter Anvin 15 years ago b1e7734f ce9c99af

+1 -1

1 changed file

expand all

arch

x86

include

asm

percpu.h

+1 -1

arch/x86/include/asm/percpu.h

··· 517 517 typeof(o2) __o2 = o2; \ 518 518 typeof(o2) __n2 = n2; \ 519 519 typeof(o2) __dummy; \ 520 - alternative_io("call this_cpu_cmpxchg16b_emu\n\t" P6_NOP4, \ 520 + alternative_io("call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP4, \ 521 521 "cmpxchg16b " __percpu_prefix "(%%rsi)\n\tsetz %0\n\t", \ 522 522 X86_FEATURE_CX16, \ 523 523 ASM_OUTPUT2("=a"(__ret), "=d"(__dummy)), \