Commit db6c996d authored by Borislav Petkov's avatar Borislav Petkov
Browse files

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: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-10-bp@alien8.de
parent b4813539

arch/x86/kernel/cpu/mce/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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));