diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-04-14 15:36:18 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-04-14 15:37:22 +0200 |
| commit | 81f64b87731aa33eef6b88af9d92c3398d48cf41 (patch) | |
| tree | f87783910714e2655795fa96e01449b42b950d0b /arch/s390 | |
| parent | a93e11f9b9604134373ae790bce738d62109de60 (diff) | |
| download | linux-stable-81f64b87731aa33eef6b88af9d92c3398d48cf41.tar.gz linux-stable-81f64b87731aa33eef6b88af9d92c3398d48cf41.tar.bz2 linux-stable-81f64b87731aa33eef6b88af9d92c3398d48cf41.zip | |
[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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/nmi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c index 4bfdc421d7e9..28cf196ba775 100644 --- a/arch/s390/kernel/nmi.c +++ b/arch/s390/kernel/nmi.c @@ -10,6 +10,7 @@ #include <linux/init.h> #include <linux/errno.h> +#include <linux/hardirq.h> #include <linux/time.h> #include <linux/module.h> #include <asm/lowcore.h> @@ -253,7 +254,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs) struct mci *mci; int umode; - lockdep_off(); + nmi_enter(); s390_idle_check(); mci = (struct mci *) &S390_lowcore.mcck_interruption_code; @@ -363,7 +364,7 @@ void notrace s390_do_machine_check(struct pt_regs *regs) mcck->warning = 1; set_thread_flag(TIF_MCCK_PENDING); } - lockdep_on(); + nmi_exit(); } static int __init machine_check_init(void) |