From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 19 Apr 2012 00:16:46 +0000 (-0700)
Subject: x86, nop: Make the ASM_NOP* macros work from assembly
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~13246^2~29
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=46326013e34eb5c178a91f06c1f2e99e79eed924;p=mirror_ubuntu-zesty-kernel.git

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
---

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)