crypto: compress - Return produced bytes in crypto_{,de}compress_{update,final}

[karo-tx-linux.git] / arch / s390 / kernel / nmi.c

diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 4bfdc421d7e92c65868d4a4b7c9783175aed9920..28cf196ba775e0e956024a123576fa15b5da1021 100644 (file)
--- 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)