Messages in this thread Patch in this message | | | Date | Tue, 14 Apr 2009 15:53:30 +0200 | From | Martin Schwidefsky <> | Subject | [patch 03/14] call nmi_enter/nmi_exit on machine checks |
| |
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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> ---
arch/s390/kernel/nmi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Index: quilt-2.6/arch/s390/kernel/nmi.c =================================================================== --- quilt-2.6.orig/arch/s390/kernel/nmi.c +++ quilt-2.6/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(struc 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(struc mcck->warning = 1; set_thread_flag(TIF_MCCK_PENDING); } - lockdep_on(); + nmi_exit(); } static int __init machine_check_init(void) -- blue skies, Martin.
"Reality continues to ruin my life." - Calvin.
| |