Messages in this thread Patch in this message | | | From | "H. Peter Anvin" <> | Subject | [PATCH 1/5] x86, nop: Make the ASM_NOP* macros work from assembly | Date | Wed, 18 Apr 2012 17:16:46 -0700 |
| |
From: "H. Peter Anvin" <hpa@zytor.com>
Make the ASM_NOP* macros work in actual assembly files.
Signed-off-by: H. Peter Anvin <hpa@zytor.com> --- arch/x86/include/asm/nops.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/nops.h b/arch/x86/include/asm/nops.h index 405b403..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) -- 1.7.6.5
| |