From: Borislav Petkov <bp@suse.de>
Date: Tue, 2 Nov 2021 10:14:48 +0000 (+0100)
Subject: x86/mce: Mark mce_read_aux() noinstr
X-Git-Tag: v5.17-rc1~181^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db6c996d6ce45dfb44891f0824a65ecec216f47a;p=thirdparty%2Flinux.git

x86/mce: Mark mce_read_aux() noinstr

Fixes

  vmlinux.o: warning: objtool: do_machine_check()+0x681: call to mce_read_aux() leaves .noinstr.text section

Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-10-bp@alien8.de
---

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 4bdcca8493ca5..53b4cfc72c8e7 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -648,7 +648,7 @@ static struct notifier_block mce_default_nb = {
 /*
  * Read ADDR and MISC registers.
  */
-static void mce_read_aux(struct mce *m, int i)
+static noinstr void mce_read_aux(struct mce *m, int i)
 {
 	if (m->status & MCI_STATUS_MISCV)
 		m->misc = mce_rdmsrl(mca_msr_reg(i, MCA_MISC));