Commit 46326013 authored Apr 18, 2012 by H. Peter Anvin Committed by H. Peter Anvin Apr 19, 2012

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

parent d405c601

arch/x86/include/asm/nops.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)