summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-04-19 04:16:46 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2012-04-20 02:07:42 +0400
commit46326013e34eb5c178a91f06c1f2e99e79eed924 (patch)
tree74a22c0021535ee5ccdc403f532abe6ed9eee34e
parentd405c60128a1973648058fa950a8960ec1f27e38 (diff)
downloadlinux-46326013e34eb5c178a91f06c1f2e99e79eed924.tar.xz
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
-rw-r--r--arch/x86/include/asm/nops.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/nops.h b/arch/x86/include/asm/nops.h
index 405b4032a60b..aff2b3356101 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)