diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-04-18 20:16:46 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-04-19 18:07:42 -0400 |
| commit | 46326013e34eb5c178a91f06c1f2e99e79eed924 (patch) | |
| tree | 74a22c0021535ee5ccdc403f532abe6ed9eee34e /arch/x86/include/asm/nops.h | |
| parent | d405c60128a1973648058fa950a8960ec1f27e38 (diff) | |
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
Diffstat (limited to 'arch/x86/include/asm/nops.h')
| -rw-r--r-- | 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 405b4032a60b..aff2b3356101 100644 --- a/arch/x86/include/asm/nops.h +++ b/arch/x86/include/asm/nops.h | |||
| @@ -87,7 +87,11 @@ | |||
| 87 | #define P6_NOP8 0x0f,0x1f,0x84,0x00,0,0,0,0 | 87 | #define P6_NOP8 0x0f,0x1f,0x84,0x00,0,0,0,0 |
| 88 | #define P6_NOP5_ATOMIC P6_NOP5 | 88 | #define P6_NOP5_ATOMIC P6_NOP5 |
| 89 | 89 | ||
| 90 | #ifdef __ASSEMBLY__ | ||
| 91 | #define _ASM_MK_NOP(x) .byte x | ||
| 92 | #else | ||
| 90 | #define _ASM_MK_NOP(x) ".byte " __stringify(x) "\n" | 93 | #define _ASM_MK_NOP(x) ".byte " __stringify(x) "\n" |
| 94 | #endif | ||
| 91 | 95 | ||
| 92 | #if defined(CONFIG_MK7) | 96 | #if defined(CONFIG_MK7) |
| 93 | #define ASM_NOP1 _ASM_MK_NOP(K7_NOP1) | 97 | #define ASM_NOP1 _ASM_MK_NOP(K7_NOP1) |