Commit 4c39e1ac authored Sep 06, 2019 by Masami Hiramatsu Committed by Greg Kroah-Hartman May 15, 2022

x86/asm: Allow to pass macros to __ASM_FORM()



commit f7919fd943abf0c77aed4441ea9897a323d132f5 upstream.

Use __stringify() at __ASM_FORM() so that user can pass
code including macros to __ASM_FORM().

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: x86@kernel.org
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: xen-devel@lists.xenproject.org
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lkml.kernel.org/r/156777562873.25081.2288083344657460959.stgit@devnote2


Signed-off-by: Maximilian Heyne <mheyne@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 29afcd5a

arch/x86/include/asm/asm.h

+5 −3

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