5 files changed, 33 insertions, 40 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 53e9dce6c657..11c99697acfe 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -249,7 +249,6 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
  *      handle_simple_irq - Simple and software-decoded IRQs.
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Simple interrupts are either sent from a demultiplexing interrupt
  *      handler or come from hardware, where no interrupt hardware control
@@ -259,7 +258,7 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
  *      unmask issues if necessary.
  */
 void fastcall
-handle_simple_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_simple_irq(unsigned int irq, struct irq_desc *desc)
 {
         struct irqaction *action;
         irqreturn_t action_ret;
@@ -279,9 +278,9 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         desc->status |= IRQ_INPROGRESS;
         spin_unlock(&desc->lock);
 
-        action_ret = handle_IRQ_event(irq, regs, action);
+        action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
@@ -293,7 +292,6 @@ out_unlock:
  *      handle_level_irq - Level type irq handler
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Level type interrupts are active as long as the hardware line has
  *      the active level. This may require to mask the interrupt and unmask
@@ -301,7 +299,7 @@ out_unlock:
  *      interrupt line is back to inactive.
  */
 void fastcall
-handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_level_irq(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int cpu = smp_processor_id();
         struct irqaction *action;
@@ -329,9 +327,9 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         desc->status &= ~IRQ_PENDING;
         spin_unlock(&desc->lock);
 
-        action_ret = handle_IRQ_event(irq, regs, action);
+        action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
@@ -345,7 +343,6 @@ out_unlock:
  *      handle_fasteoi_irq - irq handler for transparent controllers
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Only a single callback will be issued to the chip: an ->eoi()
  *      call when the interrupt has been serviced. This enables support
@@ -353,8 +350,7 @@ out_unlock:
  *      details in hardware, transparently.
  */
 void fastcall
-handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc,
-                   struct pt_regs *regs)
+handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int cpu = smp_processor_id();
         struct irqaction *action;
@@ -382,9 +378,9 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc,
         desc->status &= ~IRQ_PENDING;
         spin_unlock(&desc->lock);
 
-        action_ret = handle_IRQ_event(irq, regs, action);
+        action_ret = handle_IRQ_event(irq, action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         spin_lock(&desc->lock);
         desc->status &= ~IRQ_INPROGRESS;
@@ -398,7 +394,6 @@ out:
  *      handle_edge_irq - edge type IRQ handler
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Interrupt occures on the falling and/or rising edge of a hardware
  *      signal. The occurence is latched into the irq controller hardware
@@ -412,7 +407,7 @@ out:
  *      loop is left.
  */
 void fastcall
-handle_edge_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 {
         const unsigned int cpu = smp_processor_id();
 
@@ -463,9 +458,9 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
 
                 desc->status &= ~IRQ_PENDING;
                 spin_unlock(&desc->lock);
-                action_ret = handle_IRQ_event(irq, regs, action);
+                action_ret = handle_IRQ_event(irq, action);
                 if (!noirqdebug)
-                        note_interrupt(irq, desc, action_ret, regs);
+                        note_interrupt(irq, desc, action_ret);
                 spin_lock(&desc->lock);
 
         } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
@@ -480,12 +475,11 @@ out_unlock:
  *      handle_percpu_IRQ - Per CPU local irq handler
  *      @irq:   the interrupt number
  *      @desc:  the interrupt description structure for this irq
- *      @regs:  pointer to a register structure
  *
  *      Per CPU interrupts on SMP machines without locking requirements
  */
 void fastcall
-handle_percpu_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
         irqreturn_t action_ret;
 
@@ -494,9 +488,9 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
         if (desc->chip->ack)
                 desc->chip->ack(irq);
 
-        action_ret = handle_IRQ_event(irq, regs, desc->action);
+        action_ret = handle_IRQ_event(irq, desc->action);
         if (!noirqdebug)
-                note_interrupt(irq, desc, action_ret, regs);
+                note_interrupt(irq, desc, action_ret);
 
         if (desc->chip->eoi)
                 desc->chip->eoi(irq);
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 4c6cdbaed661..42aa6f1a3f0f 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -27,7 +27,7 @@
  * Handles spurious and unhandled IRQ's. It also prints a debugmessage.
  */
 void fastcall
-handle_bad_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
+handle_bad_irq(unsigned int irq, struct irq_desc *desc)
 {
         print_irq_desc(irq, desc);
         kstat_this_cpu.irqs[irq]++;
@@ -115,7 +115,7 @@ struct irq_chip dummy_irq_chip = {
 /*
  * Special, empty irq handler:
  */
-irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs)
+irqreturn_t no_action(int cpl, void *dev_id)
 {
         return IRQ_NONE;
 }
@@ -123,13 +123,11 @@ irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs)
 /**
  * handle_IRQ_event - irq action chain handler
  * @irq:        the interrupt number
- * @regs:       pointer to a register structure
  * @action:     the interrupt action chain for this irq
  *
  * Handles the action chain of an irq event
  */
-irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
-                             struct irqaction *action)
+irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
 {
         irqreturn_t ret, retval = IRQ_NONE;
         unsigned int status = 0;
@@ -140,7 +138,7 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
                 local_irq_enable_in_hardirq();
 
         do {
-                ret = action->handler(irq, action->dev_id, regs);
+                ret = action->handler(irq, action->dev_id);
                 if (ret == IRQ_HANDLED)
                         status |= action->flags;
                 retval |= ret;
@@ -158,7 +156,6 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
 /**
  * __do_IRQ - original all in one highlevel IRQ handler
  * @irq:        the interrupt number
- * @regs:       pointer to a register structure
  *
  * __do_IRQ handles all normal device IRQ's (the special
  * SMP cross-CPU interrupts have their own specific
@@ -167,7 +164,7 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
  * This is the original x86 implementation which is used for every
  * interrupt type.
  */
-fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs)
+fastcall unsigned int __do_IRQ(unsigned int irq)
 {
         struct irq_desc *desc = irq_desc + irq;
         struct irqaction *action;
@@ -182,7 +179,7 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs)
                  */
                 if (desc->chip->ack)
                         desc->chip->ack(irq);
-                action_ret = handle_IRQ_event(irq, regs, desc->action);
+                action_ret = handle_IRQ_event(irq, desc->action);
                 desc->chip->end(irq);
                 return 1;
         }
@@ -233,11 +230,11 @@ fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs)
 
                 spin_unlock(&desc->lock);
 
-                action_ret = handle_IRQ_event(irq, regs, action);
+                action_ret = handle_IRQ_event(irq, action);
 
                 spin_lock(&desc->lock);
                 if (!noirqdebug)
-                        note_interrupt(irq, desc, action_ret, regs);
+                        note_interrupt(irq, desc, action_ret);
                 if (likely(!(desc->status & IRQ_PENDING)))
                         break;
                 desc->status &= ~IRQ_PENDING;
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 417e98092cf2..543ea2e5ad93 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -16,7 +16,7 @@ static int irqfixup __read_mostly;
 /*
  * Recovery handler for misrouted interrupts.
  */
-static int misrouted_irq(int irq, struct pt_regs *regs)
+static int misrouted_irq(int irq)
 {
         int i;
         int ok = 0;
@@ -49,7 +49,7 @@ static int misrouted_irq(int irq, struct pt_regs *regs)
                 while (action) {
                         /* Only shared IRQ handlers are safe to call */
                         if (action->flags & IRQF_SHARED) {
-                                if (action->handler(i, action->dev_id, regs) ==
+                                if (action->handler(i, action->dev_id) ==
                                                 IRQ_HANDLED)
                                         ok = 1;
                         }
@@ -70,7 +70,7 @@ static int misrouted_irq(int irq, struct pt_regs *regs)
                          */
                         work = 1;
                         spin_unlock(&desc->lock);
-                        handle_IRQ_event(i, regs, action);
+                        handle_IRQ_event(i, action);
                         spin_lock(&desc->lock);
                         desc->status &= ~IRQ_PENDING;
                 }
@@ -136,7 +136,7 @@ report_bad_irq(unsigned int irq, struct irq_desc *desc, irqreturn_t action_ret)
 }
 
 void note_interrupt(unsigned int irq, struct irq_desc *desc,
-                    irqreturn_t action_ret, struct pt_regs *regs)
+                    irqreturn_t action_ret)
 {
         if (unlikely(action_ret != IRQ_HANDLED)) {
                 desc->irqs_unhandled++;
@@ -147,7 +147,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
         if (unlikely(irqfixup)) {
                 /* Don't punish working computers */
                 if ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) {
-                        int ok = misrouted_irq(irq, regs);
+                        int ok = misrouted_irq(irq);
                         if (action_ret == IRQ_NONE)
                                 desc->irqs_unhandled -= ok;
                 }
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index 7a4144ba3afd..f1f900ac3164 100644
--- a/kernel/power/poweroff.c
+++ b/kernel/power/poweroff.c
@@ -23,8 +23,7 @@ static void do_poweroff(void *dummy)
 
 static DECLARE_WORK(poweroff_work, do_poweroff, NULL);
 
-static void handle_poweroff(int key, struct pt_regs *pt_regs,
-                                struct tty_struct *tty)
+static void handle_poweroff(int key, struct tty_struct *tty)
 {
         schedule_work(&poweroff_work);
 }
diff --git a/kernel/profile.c b/kernel/profile.c
index fb660c7d35ba..857300a2afec 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -25,6 +25,7 @@
 #include <linux/mutex.h>
 #include <asm/sections.h>
 #include <asm/semaphore.h>
+#include <asm/irq_regs.h>
 
 struct profile_hit {
         u32 pc, hits;
@@ -366,8 +367,10 @@ void profile_hit(int type, void *__pc)
 }
 #endif /* !CONFIG_SMP */
 
-void profile_tick(int type, struct pt_regs *regs)
+void profile_tick(int type)
 {
+        struct pt_regs *regs = get_irq_regs();
+
         if (type == CPU_PROFILING && timer_hook)
                 timer_hook(regs);
         if (!user_mode(regs) && cpu_isset(smp_processor_id(), prof_cpu_mask))