Merge git://git.infradead.org/~dhowells/irq-2.6

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
  IRQ: Typedef the IRQ handler function type
  IRQ: Typedef the IRQ flow handler function type

1 files changed, 7 insertions, 5 deletions

diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index 3dd2e180151b..8cfc7dbec7b9 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -53,6 +53,7 @@ static union irq_ctx *softirq_ctx[NR_CPUS] __read_mostly;
  */
 fastcall unsigned int do_IRQ(struct pt_regs *regs)
 {       
+        struct pt_regs *old_regs;
         /* high bit used in ret_from_ code */
         int irq = ~regs->orig_eax;
         struct irq_desc *desc = irq_desc + irq;
@@ -67,6 +68,7 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
                 BUG();
         }
 
+        old_regs = set_irq_regs(regs);
         irq_enter();
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
         /* Debugging check for stack overflow: is there less than 1KB free? */
@@ -95,7 +97,7 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
          * current stack (which is the irq stack already after all)
          */
         if (curctx != irqctx) {
-                int arg1, arg2, arg3, ebx;
+                int arg1, arg2, ebx;
 
                 /* build the stack frame on the IRQ stack */
                 isp = (u32*) ((char*)irqctx + sizeof(*irqctx));
@@ -114,17 +116,17 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
                         "       xchgl  %%ebx,%%esp      \n"
                         "       call   *%%edi           \n"
                         "       movl   %%ebx,%%esp      \n"
-                        : "=a" (arg1), "=d" (arg2), "=c" (arg3), "=b" (ebx)
-                        :  "0" (irq),   "1" (desc),  "2" (regs),  "3" (isp),
+                        : "=a" (arg1), "=d" (arg2), "=b" (ebx)
+                        :  "0" (irq),   "1" (desc),  "2" (isp),
                            "D" (desc->handle_irq)
                         : "memory", "cc"
                 );
         } else
 #endif
-                desc->handle_irq(irq, desc, regs);
+                desc->handle_irq(irq, desc);
 
         irq_exit();
-
+        set_irq_regs(old_regs);
         return 1;
 }