summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/mce/winchip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2020-04-03 22:37:31 +0200
committerThomas Gleixner <tglx@linutronix.de>2020-06-11 15:14:56 +0200
commit94a46d316f2b54e3de8a4fa884cb16383db7fcd8 (patch)
tree6cafbbfb177b93090f9a41515227d5f7402b47a3 /arch/x86/kernel/cpu/mce/winchip.c
parent2c058b03cc06ba485169778a271f87e5ac57dd83 (diff)
downloadlinux-94a46d316f2b54e3de8a4fa884cb16383db7fcd8.tar.bz2
x86/mce: Move nmi_enter/exit() into the entry point
There is no reason to have nmi_enter/exit() in the actual MCE handlers. Move it to the entry point. This also covers the until now uncovered initial handler which only prints. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Andy Lutomirski <luto@kernel.org> Link: https://lkml.kernel.org/r/20200505135314.243936614@linutronix.de
Diffstat (limited to 'arch/x86/kernel/cpu/mce/winchip.c')
-rw-r--r--arch/x86/kernel/cpu/mce/winchip.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mce/winchip.c b/arch/x86/kernel/cpu/mce/winchip.c
index b3938c195365..3f8f84ba0f51 100644
--- a/arch/x86/kernel/cpu/mce/winchip.c
+++ b/arch/x86/kernel/cpu/mce/winchip.c
@@ -19,12 +19,8 @@
/* Machine check handler for WinChip C6: */
static void winchip_machine_check(struct pt_regs *regs, long error_code)
{
- nmi_enter();
-
pr_emerg("CPU0: Machine Check Exception.\n");
add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);
-
- nmi_exit();
}
/* Set up machine check reporting on the Winchip C6 series */