diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 18:21:41 -0400 |
| commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
| tree | 255f862839c593c796e609328575b611e3f56cf3 /arch/ppc64/kernel/irq.c | |
| parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
| parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/ppc64/kernel/irq.c')
| -rw-r--r-- | arch/ppc64/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/irq.c b/arch/ppc64/kernel/irq.c index 3defc8c33adf..ffe300611f00 100644 --- a/arch/ppc64/kernel/irq.c +++ b/arch/ppc64/kernel/irq.c | |||
| @@ -245,7 +245,7 @@ void ppc_irq_dispatch_handler(struct pt_regs *regs, int irq) | |||
| 245 | 245 | ||
| 246 | spin_lock(&desc->lock); | 246 | spin_lock(&desc->lock); |
| 247 | if (!noirqdebug) | 247 | if (!noirqdebug) |
| 248 | note_interrupt(irq, desc, action_ret); | 248 | note_interrupt(irq, desc, action_ret, regs); |
| 249 | if (likely(!(desc->status & IRQ_PENDING))) | 249 | if (likely(!(desc->status & IRQ_PENDING))) |
| 250 | break; | 250 | break; |
| 251 | desc->status &= ~IRQ_PENDING; | 251 | desc->status &= ~IRQ_PENDING; |