---

yaml --- r: 305432 b: refs/heads/master c: 4632601 h: refs/heads/master v: v3
git-mirror · Apr 19, 2012 · d54147b · d54147b
1 parent 6db9ce0
commit d54147b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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)