diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-04 04:59:36 -0500 |
| commit | 4010b0192ddf6ec7ec1b9feb9b0953692aeb7329 (patch) | |
| tree | 188a36186f6ce580b479a9f90404fa7bfd8b22d7 /drivers/s390/cio/cio.c | |
| parent | 79ff56ebd3edfb16f8badc558cb439b203a3298f (diff) | |
| parent | 7d3b56ba37a95f1f370f50258ed3954c304c524b (diff) | |
Merge branch 'linus' into core/urgent
Diffstat (limited to 'drivers/s390/cio/cio.c')
| -rw-r--r-- | drivers/s390/cio/cio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c index 8a8df7552969..06b71823f399 100644 --- a/drivers/s390/cio/cio.c +++ b/drivers/s390/cio/cio.c | |||
| @@ -632,8 +632,8 @@ do_IRQ (struct pt_regs *regs) | |||
| 632 | struct pt_regs *old_regs; | 632 | struct pt_regs *old_regs; |
| 633 | 633 | ||
| 634 | old_regs = set_irq_regs(regs); | 634 | old_regs = set_irq_regs(regs); |
| 635 | irq_enter(); | ||
| 636 | s390_idle_check(); | 635 | s390_idle_check(); |
| 636 | irq_enter(); | ||
| 637 | if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator) | 637 | if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator) |
| 638 | /* Serve timer interrupts first. */ | 638 | /* Serve timer interrupts first. */ |
| 639 | clock_comparator_work(); | 639 | clock_comparator_work(); |