projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform
[firefly-linux-kernel-4.4.55.git]
/
arch
/
s390
/
kernel
/
nmi.c
diff --git
a/arch/s390/kernel/nmi.c
b/arch/s390/kernel/nmi.c
index a6daa5c5cdb047708be93a173e47095af9d0f9f4..7918fbea36bb31446d6bea5d438854c8c2464938 100644
(file)
--- a/
arch/s390/kernel/nmi.c
+++ b/
arch/s390/kernel/nmi.c
@@
-254,7
+254,7
@@
void notrace s390_do_machine_check(struct pt_regs *regs)
int umode;
nmi_enter();
-
kstat_cpu(smp_processor_id()).irqs[NMI_NMI]++
;
+
inc_irq_stat(NMI_NMI)
;
mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
mcck = &__get_cpu_var(cpu_mcck);
umode = user_mode(regs);