The following commit has been merged into the ras/core branch of tip: Commit-ID: db6c996d6ce45dfb44891f0824a65ecec216f47a Gitweb: https://git.kernel.org/tip/db6c996d6ce45dfb44891f0824a65ecec216f47a Author: Borislav Petkov <bp@xxxxxxx> AuthorDate: Tue, 02 Nov 2021 11:14:48 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Mon, 13 Dec 2021 14:13:23 +01:00 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@xxxxxxx> Link: https://lore.kernel.org/r/20211208111343.8130-10-bp@xxxxxxxxx --- arch/x86/kernel/cpu/mce/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 4bdcca8..53b4cfc 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));
![]() |