projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b26d3a8
)
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
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:04:40 +0000
(11:04 +0100)
[ 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>
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 c37a0bcf2744bf8e7c582748292a826d2fc63fe2..e23e74e2f928d2b2e31bebeac9fcffd171f8bdce 100644
(file)
--- a/
arch/x86/kernel/cpu/mce/core.c
+++ b/
arch/x86/kernel/cpu/mce/core.c
@@
-691,7
+691,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));