diff options
| author | Borislav Petkov <bp@suse.de> | 2021-11-02 11:14:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-01-27 10:54:16 +0100 |
| commit | 8c72de32ff134f48115591b9ea2bb03c1bbd3804 (patch) | |
| tree | 1ba1ecfb7e4eb144f35694b707b0bfe80d3987a4 /arch | |
| parent | 1ad3e60f1fec185d11196028136e60e8e3009b37 (diff) | |
| download | linux-stable-8c72de32ff134f48115591b9ea2bb03c1bbd3804.tar.gz linux-stable-8c72de32ff134f48115591b9ea2bb03c1bbd3804.tar.bz2 linux-stable-8c72de32ff134f48115591b9ea2bb03c1bbd3804.zip | |
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: 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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 2a608f081976..5cf1a024408b 100644 --- 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)); |