diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-19 19:52:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-19 19:52:45 +1100 |
| commit | a4ec4a702cf4efc6ef609882314c2d8491e48ee5 (patch) | |
| tree | d5a52a47c6fef1b34d2c6dbbe94ee9d3ee73eb0b /drivers | |
| parent | 8787db875e1dff7da359aa82ae50d1f44e3ad819 (diff) | |
| parent | 72d8f915f392c0520cbdded643e3401664ba5b23 (diff) | |
Merge commit 'cputime/cputime'
Conflicts:
kernel/sched.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/cio/cio.c | 2 | ||||
| -rw-r--r-- | drivers/s390/s390mach.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 36af2636d910..72dd7b17507e 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c @@ -597,8 +597,8 @@ do_IRQ (struct pt_regs *regs) struct pt_regs *old_regs; old_regs = set_irq_regs(regs); - irq_enter(); s390_idle_check(); + irq_enter(); if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator) /* Serve timer interrupts first. */ clock_comparator_work(); diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c index 834e9ee7e934..92b0417f8e12 100644 --- a/drivers/s390/s390mach.c +++ b/drivers/s390/s390mach.c @@ -18,6 +18,7 @@ #include <asm/etr.h> #include <asm/lowcore.h> #include <asm/cio.h> +#include <asm/cpu.h> #include "s390mach.h" static struct semaphore m_sem; @@ -369,6 +370,8 @@ s390_do_machine_check(struct pt_regs *regs) lockdep_off(); + s390_idle_check(); + mci = (struct mci *) &S390_lowcore.mcck_interruption_code; mcck = &__get_cpu_var(cpu_mcck); umode = user_mode(regs); |