This is a note to let you know that I've just added the patch titled
x86/asm: Allow to pass macros to __ASM_FORM()
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-asm-allow-to-pass-macros-to-__asm_form.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@vger.kernel.org> know about it.
>From f7919fd943abf0c77aed4441ea9897a323d132f5 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhira...@kernel.org>
Date: Fri, 6 Sep 2019 22:13:48 +0900
Subject: x86/asm: Allow to pass macros to __ASM_FORM()
From: Masami Hiramatsu <mhira...@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 <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-devel@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
Signed-off-by: Maximilian Heyne <mhe...@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
arch/x86/include/asm/asm.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- 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__
Patches currently in stable-queue which might be from mhira...@kernel.org are
queue-5.4/x86-xen-kvm-gather-the-definition-of-emulate-prefixes.patch
queue-5.4/x86-xen-insn-decode-xen-and-kvm-emulate-prefix-signature.patch
queue-5.4/x86-asm-allow-to-pass-macros-to-__asm_form.patch
queue-5.4/x86-kprobes-prohibit-probing-on-instruction-which-has-emulate-prefix.patch
