Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcd7e8cc authored by Borislav Petkov's avatar Borislav Petkov Committed by Greg Kroah-Hartman
Browse files

x86/mce: Mark mce_read_aux() noinstr 



[ Upstream commit db6c996d6ce45dfb44891f0824a65ecec216f47a ]

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


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a0d17139

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

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,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(msr_ops.misc(i));