From: "H. Peter Anvin" <hpa@zytor.com>
To: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@amd64.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 1/5] x86, nop: Make the ASM_NOP* macros work from assembly
Date: Wed, 18 Apr 2012 17:16:46 -0700 [thread overview]
Message-ID: <1334794610-5546-2-git-send-email-hpa@zytor.com> (raw)
In-Reply-To: <1334794610-5546-1-git-send-email-hpa@zytor.com>
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
next prev parent reply other threads:[~2012-04-19 0:17 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-19 0:16 [PATCH 0/5] RFC: x86: Early exception table support H. Peter Anvin
2012-04-19 0:16 ` H. Peter Anvin [this message]
2012-04-19 9:29 ` [PATCH 1/5] x86, nop: Make the ASM_NOP* macros work from assembly Borislav Petkov
2012-04-20 0:24 ` [tip:x86/extable] " tip-bot for H. Peter Anvin
2012-04-19 0:16 ` [PATCH 2/5] x86: Add symbolic constant for exceptions with error code H. Peter Anvin
2012-04-19 9:30 ` Borislav Petkov
2012-04-20 0:25 ` [tip:x86/extable] " tip-bot for H. Peter Anvin
2012-04-19 0:16 ` [PATCH 3/5] x86, paravirt: Replace GET_CR2_INTO_RCX with GET_CR2_INTO_RAX H. Peter Anvin
2012-04-20 0:26 ` [tip:x86/extable] " tip-bot for H. Peter Anvin
2012-04-19 0:16 ` [PATCH 4/5] x86-64: Handle exception table entries during early boot H. Peter Anvin
2012-04-19 13:02 ` Borislav Petkov
2012-04-19 16:59 ` H. Peter Anvin
2012-04-19 17:16 ` Borislav Petkov
2012-04-20 0:29 ` [tip:x86/extable] x86, doc: Revert "x86: Document rdmsr_safe restrictions" tip-bot for H. Peter Anvin
2012-04-20 0:28 ` [tip:x86/extable] x86-64: Handle exception table entries during early boot tip-bot for H. Peter Anvin
2012-04-19 0:16 ` [PATCH 5/5] x86-32: " H. Peter Anvin
2012-04-20 0:28 ` [tip:x86/extable] " tip-bot for H. Peter Anvin
2012-04-19 9:22 ` [PATCH 0/5] RFC: x86: Early exception table support Borislav Petkov
2012-04-19 9:24 ` [PATCH 1/3] x86, extable: Cleanup fixup_exception Borislav Petkov
2012-04-19 9:25 ` [PATCH 2/3] x86, extable: Carve out the main extable searching routine Borislav Petkov
2012-04-19 9:26 ` [PATCH 3/3] x86, extable: Handle early exceptions Borislav Petkov
2012-04-19 17:02 ` H. Peter Anvin
2012-04-19 17:27 ` Linus Torvalds
2012-04-19 17:38 ` Borislav Petkov
2012-04-19 17:59 ` H. Peter Anvin
2012-04-19 18:25 ` Linus Torvalds
2012-04-19 18:55 ` H. Peter Anvin
2012-04-19 20:17 ` David Daney
2012-04-19 20:20 ` H. Peter Anvin
2012-04-19 20:26 ` H. Peter Anvin
2012-04-19 20:40 ` David Daney
2012-04-19 21:47 ` Linus Torvalds
2012-04-19 22:16 ` H. Peter Anvin
2012-04-19 22:47 ` Tony Luck
2012-04-19 22:58 ` Linus Torvalds
2012-04-19 23:10 ` H. Peter Anvin
2012-04-19 23:26 ` Tony Luck
2012-04-19 23:35 ` H. Peter Anvin
2012-04-20 8:26 ` Andreas Schwab
2012-04-19 18:11 ` Linus Torvalds
2012-04-20 8:46 ` Borislav Petkov
2012-04-19 17:54 ` H. Peter Anvin
2012-04-20 0:27 ` [tip:x86/extable] x86, extable: Add early_fixup_exception() tip-bot for H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334794610-5546-2-git-send-email-hpa@zytor.com \
--to=hpa@zytor.com \
--cc=bp@amd64.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®