[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157140289913.29376.11199090886356756663.tip-bot2@tip-bot2>
Date: Fri, 18 Oct 2019 12:48:19 -0000
From: "tip-bot2 for Masami Hiramatsu" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Masami Hiramatsu <mhiramat@...nel.org>,
"Peter Zijlstra (Intel)" <peterz@...radead.org>,
Juergen Gross <jgross@...e.com>, x86@...nel.org,
Boris Ostrovsky <boris.ostrovsky@...cle.com>,
Ingo Molnar <mingo@...nel.org>,
Stefano Stabellini <sstabellini@...nel.org>,
Andrew Cooper <andrew.cooper3@...rix.com>,
Borislav Petkov <bp@...en8.de>, xen-devel@...ts.xenproject.org,
Randy Dunlap <rdunlap@...radead.org>,
Josh Poimboeuf <jpoimboe@...hat.com>,
linux-kernel@...r.kernel.org
Subject: [tip: x86/core] x86/asm: Allow to pass macros to __ASM_FORM()
The following commit has been merged into the x86/core branch of tip:
Commit-ID: f7919fd943abf0c77aed4441ea9897a323d132f5
Gitweb: https://git.kernel.org/tip/f7919fd943abf0c77aed4441ea9897a323d132f5
Author: Masami Hiramatsu <mhiramat@...nel.org>
AuthorDate: Fri, 06 Sep 2019 22:13:48 +09:00
Committer: Peter Zijlstra <peterz@...radead.org>
CommitterDate: Thu, 17 Oct 2019 21:31:57 +02:00
x86/asm: Allow to pass macros to __ASM_FORM()
Use __stringify() at __ASM_FORM() so that user can pass
code including macros to __ASM_FORM().
Signed-off-by: Masami Hiramatsu <mhiramat@...nel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Juergen Gross <jgross@...e.com>
Cc: x86@...nel.org
Cc: Boris Ostrovsky <boris.ostrovsky@...cle.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Stefano Stabellini <sstabellini@...nel.org>
Cc: Andrew Cooper <andrew.cooper3@...rix.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: xen-devel@...ts.xenproject.org
Cc: Randy Dunlap <rdunlap@...radead.org>
Cc: Josh Poimboeuf <jpoimboe@...hat.com>
Link: https://lkml.kernel.org/r/156777562873.25081.2288083344657460959.stgit@devnote2
---
arch/x86/include/asm/asm.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 3ff577c..1b563f9 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -7,9 +7,11 @@
# define __ASM_FORM_RAW(x) x
# define __ASM_FORM_COMMA(x) x,
#else
-# define __ASM_FORM(x) " " #x " "
-# define __ASM_FORM_RAW(x) #x
-# define __ASM_FORM_COMMA(x) " " #x ","
+#include <linux/stringify.h>
+
+# define __ASM_FORM(x) " " __stringify(x) " "
+# define __ASM_FORM_RAW(x) __stringify(x)
+# define __ASM_FORM_COMMA(x) " " __stringify(x) ","
#endif
#ifndef __x86_64__
Powered by blists - more mailing lists