From d54147b4c91c7f3f5c60ec74dc77c060af9fe75f Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 18 Apr 2012 17:16:46 -0700
Subject: [PATCH] --- yaml --- r: 305432 b: refs/heads/master c:
 46326013e34eb5c178a91f06c1f2e99e79eed924 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/include/asm/nops.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7bc1d8373ea7..a689c4409db7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d405c60128a1973648058fa950a8960ec1f27e38
+refs/heads/master: 46326013e34eb5c178a91f06c1f2e99e79eed924
diff --git a/trunk/arch/x86/include/asm/nops.h b/trunk/arch/x86/include/asm/nops.h
index 405b4032a60b..aff2b3356101 100644
--- a/trunk/arch/x86/include/asm/nops.h
+++ b/trunk/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)