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 <mhira...@kernel.org> AuthorDate: Fri, 06 Sep 2019 22:13:48 +09:00 Committer: Peter Zijlstra <pet...@infradead.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 <mhira...@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Juergen Gross <jgr...@suse.com> Cc: x...@kernel.org Cc: Boris Ostrovsky <boris.ostrov...@oracle.com> Cc: Ingo Molnar <mi...@kernel.org> Cc: Stefano Stabellini <sstabell...@kernel.org> Cc: Andrew Cooper <andrew.coop...@citrix.com> Cc: Borislav Petkov <b...@alien8.de> Cc: xen-de...@lists.xenproject.org Cc: Randy Dunlap <rdun...@infradead.org> Cc: Josh Poimboeuf <jpoim...@redhat.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__
