xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/mce: Mark mce_read_aux() noinstr

Browse Source 
[ Upstream commit db6c996d6ce45dfb44891f0824a65ecec216f47a ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Borislav Petkov
2021-11-02 11:14:48 +01:00
committed by Greg Kroah-Hartman
parent 1ad3e60f1f
commit 8c72de32ff
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/cpu/mce/core.c
View File

@@ -691,7 +691,7 @@ static struct notifier_block mce_default_nb = {
/* /*
* Read ADDR and MISC registers. * 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) if (m->status & MCI_STATUS_MISCV)
m->misc = mce_rdmsrl(msr_ops.misc(i)); m->misc = mce_rdmsrl(msr_ops.misc(i));