Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/s390/kernel/nmi.c

+3 −2
Original line number Diff line number Diff line
@@ -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)