Automerge with /usr/src/ntfs-2.6.git.

[linux-2.6] / kernel / irq / handle.c

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 436c7d93c00a9555f245da72ce9efced1bffd47b..c29f83c16497cff719b118bf1a8fabfb78076cd2 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -172,7 +172,7 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs)
 
                spin_lock(&desc->lock);
                if (!noirqdebug)
-                       note_interrupt(irq, desc, action_ret);
+                       note_interrupt(irq, desc, action_ret, regs);
                if (likely(!(desc->status & IRQ_PENDING)))
                        break;
                desc->status &= ~IRQ_PENDING;