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 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
nmi.c
diff --git
a/arch/s390/kernel/nmi.c
b/arch/s390/kernel/nmi.c
index
015e27d
..
ac15139
100644
(file)
--- a/
arch/s390/kernel/nmi.c
+++ b/
arch/s390/kernel/nmi.c
@@
-255,7
+255,8
@@
void notrace s390_do_machine_check(struct pt_regs *regs)
int umode;
nmi_enter();
- s390_idle_check();
+ s390_idle_check(regs, S390_lowcore.mcck_clock,
+ S390_lowcore.mcck_enter_timer);
mci = (struct mci *) &S390_lowcore.mcck_interruption_code;
mcck = &__get_cpu_var(cpu_mcck);