git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
nmi.c
diff --git
a/arch/s390/kernel/nmi.c
b/arch/s390/kernel/nmi.c
index
a6daa5c
..
7918fbe
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);