commit 46326013e34eb5c178a91f06c1f2e99e79eed924
author H. Peter Anvin <hpa@zytor.com> Wed Apr 18 17:16:46 2012 -0700
committer H. Peter Anvin <hpa@linux.intel.com> Thu Apr 19 15:07:42 2012 -0700
tree 74a22c0021535ee5ccdc403f532abe6ed9eee34e
parent d405c60128a1973648058fa950a8960ec1f27e38

x86, nop: Make the ASM_NOP* macros work from assembly

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

diff --git a/arch/x86/include/asm/nops.h b/arch/x86/include/asm/nops.h
index 405b4032..aff2b33 100644
--- a/arch/x86/include/asm/nops.h
+++ b/arch/x86/include/asm/nops.h
@@ -87,7 +87,11 @@
 #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)