projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b481353
)
x86/mce: Mark mce_read_aux() noinstr
author
Borislav Petkov
<bp@suse.de>
Tue, 2 Nov 2021 10:14:48 +0000
(11:14 +0100)
committer
Borislav Petkov
<bp@suse.de>
Mon, 13 Dec 2021 13:13:23 +0000
(14:13 +0100)
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
arch/x86/kernel/cpu/mce/core.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/cpu/mce/core.c
b/arch/x86/kernel/cpu/mce/core.c
index
4bdcca8
..
53b4cfc
100644
(file)
--- 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));