From: Masami Hiramatsu mhiramat@kernel.org

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@devno... Signed-off-by: Maximilian Heyne mheyne@amazon.de Cc: stable@vger.kernel.org # 5.4.x --- 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 3ff577c0b102..1b563f9167ea 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__