Skip to content

Commit

Permalink
[S390] call nmi_enter/nmi_exit on machine checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Apr 14, 2009
1 parent a93e11f commit 81f64b8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/s390/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 81f64b8

Please sign in to comment.