Linux-EDAC Archive on
 help / color / Atom feed
* [PATCH] x86: Correct noinstr qualifiers
@ 2020-07-23 16:14 ira.weiny
  0 siblings, 0 replies; only message in thread
From: ira.weiny @ 2020-07-23 16:14 UTC (permalink / raw)
  To: Peter Zijlstra
  Cc: Ira Weiny, Tony Luck, x86, linux-kernel, linux-edac,
	Thomas Gleixner, Ingo Molnar, Borislav Petkov, Andy Lutomirski

From: Ira Weiny <>

The noinstr qualifier is to be specified before the return type in the
same way inline is used.

These 2 cases were missed by previous patches.

Reviewed-by: Tony Luck <>
Signed-off-by: Ira Weiny <>
 arch/x86/kernel/alternative.c  | 2 +-
 arch/x86/kernel/cpu/mce/core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 20e07feb4064..4b7b980c87df 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -1046,7 +1046,7 @@ static __always_inline int patch_cmp(const void *key, const void *elt)
 	return 0;
-int noinstr poke_int3_handler(struct pt_regs *regs)
+noinstr int poke_int3_handler(struct pt_regs *regs)
 	struct bp_patching_desc *desc;
 	struct text_poke_loc *tp;
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 1a0139d9a34b..c5204d7bca2b 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -1214,7 +1214,7 @@ static void kill_me_maybe(struct callback_head *cb)
  * backing the user stack, tracing that reads the user stack will cause
  * potentially infinite recursion.
-void noinstr do_machine_check(struct pt_regs *regs)
+noinstr void do_machine_check(struct pt_regs *regs)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-23 16:14 [PATCH] x86: Correct noinstr qualifiers ira.weiny

Linux-EDAC Archive on

Archives are clonable:
	git clone --mirror linux-edac/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-edac linux-edac/ \
	public-inbox-index linux-edac

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone