x86, nop: Make the ASM_NOP* macros work from assembly
authorH. Peter Anvin <hpa@zytor.com>
Thu, 19 Apr 2012 00:16:46 +0000 (17:16 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 19 Apr 2012 22:07:42 +0000 (15:07 -0700)
Make the ASM_NOP* macros work in actual assembly files.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/r/1334794610-5546-2-git-send-email-hpa@zytor.com
arch/x86/include/asm/nops.h

index 405b4032a60b37200e2e2ecfae8289c792800755..aff2b3356101487dbdfefddd73853e6f4dbf7b6e 100644 (file)
 #define P6_NOP8        0x0f,0x1f,0x84,0x00,0,0,0,0
 #define P6_NOP5_ATOMIC P6_NOP5
 
+#ifdef __ASSEMBLY__
+#define _ASM_MK_NOP(x) .byte x
+#else
 #define _ASM_MK_NOP(x) ".byte " __stringify(x) "\n"
+#endif
 
 #if defined(CONFIG_MK7)
 #define ASM_NOP1 _ASM_MK_NOP(K7_NOP1)