diff options
| author | Borislav Petkov <bp@suse.de> | 2021-11-02 11:14:48 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-12-13 14:13:23 +0100 |
| commit | db6c996d6ce45dfb44891f0824a65ecec216f47a (patch) | |
| tree | b67b2114ecd05a0a6c84f00440f7fc6cd75555a9 /arch/x86/kernel | |
| parent | b4813539d37fa31fed62cdfab7bd2dd8929c5b2e (diff) | |
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@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-10-bp@alien8.de
Diffstat (limited to 'arch/x86/kernel')
| -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 4bdcca8493ca..53b4cfc72c8e 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)); |