Commit 81f64b87 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

[S390] call nmi_enter/nmi_exit on machine checks

nmi_enter/nmi_exit includes the lockdep calls and various
other calls which were missing so far.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a93e11f9
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/hardirq.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/lowcore.h> #include <asm/lowcore.h>
...@@ -253,7 +254,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs) ...@@ -253,7 +254,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs)
struct mci *mci; struct mci *mci;
int umode; int umode;
lockdep_off(); nmi_enter();
s390_idle_check(); s390_idle_check();
mci = (struct mci *) &S390_lowcore.mcck_interruption_code; mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
...@@ -363,7 +364,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs) ...@@ -363,7 +364,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs)
mcck->warning = 1; mcck->warning = 1;
set_thread_flag(TIF_MCCK_PENDING); set_thread_flag(TIF_MCCK_PENDING);
} }
lockdep_on(); nmi_exit();
} }
static int __init machine_check_init(void) static int __init machine_check_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment