x86/mce: Mark mce_read_aux() noinstr

suryasaimadhu · suryasaimadhu · commit db6c996d6ce4 · 2021-12-13T14:13:23.000+01:00
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
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ static struct notifier_block mce_default_nb = {`
`648`	`648`	`/*`
`649`	`649`	`* Read ADDR and MISC registers.`
`650`	`650`	`*/`
`651`		`-static void mce_read_aux(struct mce *m, int i)`
	`651`	`+static noinstr void mce_read_aux(struct mce *m, int i)`
`652`	`652`	`{`
`653`	`653`	`if (m->status & MCI_STATUS_MISCV)`
`654`	`654`	`m->misc = mce_rdmsrl(mca_msr_reg(i, MCA_MISC));`