4 files changed, 14 insertions, 10 deletions

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 51df337b37db..0f6530117105 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -76,10 +76,11 @@ irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs)
 /*
  * Have got an event to handle:
  */
-fastcall int handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
+fastcall irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
                                 struct irqaction *action)
 {
-        int ret, retval = 0, status = 0;
+        irqreturn_t ret, retval = IRQ_NONE;
+        unsigned int status = 0;
 
         if (!(action->flags & SA_INTERRUPT))
                 local_irq_enable();
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 134f9f2e0e39..a12d00eb5e7c 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -30,7 +30,7 @@ void move_native_irq(int irq)
 
         desc->move_irq = 0;
 
-        if (likely(cpus_empty(pending_irq_cpumask[irq])))
+        if (unlikely(cpus_empty(pending_irq_cpumask[irq])))
                 return;
 
         if (!desc->handler->set_affinity)
@@ -49,7 +49,7 @@ void move_native_irq(int irq)
          * cause some ioapics to mal-function.
          * Being paranoid i guess!
          */
-        if (unlikely(!cpus_empty(tmp))) {
+        if (likely(!cpus_empty(tmp))) {
                 if (likely(!(desc->status & IRQ_DISABLED)))
                         desc->handler->disable(irq);
 
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index d03b5eef8ce0..afacd6f585fa 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -24,6 +24,8 @@ static struct proc_dir_entry *smp_affinity_entry[NR_IRQS];
 #ifdef CONFIG_GENERIC_PENDING_IRQ
 void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val)
 {
+        set_balance_irq_affinity(irq, mask_val);
+
         /*
          * Save these away for later use. Re-progam when the
          * interrupt is pending
@@ -33,6 +35,7 @@ void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val)
 #else
 void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val)
 {
+        set_balance_irq_affinity(irq, mask_val);
         irq_affinity[irq] = mask_val;
         irq_desc[irq].handler->set_affinity(irq, mask_val);
 }
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 7df9abd5ec86..b2fb3c18d06b 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -11,7 +11,7 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 
-static int irqfixup;
+static int irqfixup __read_mostly;
 
 /*
  * Recovery handler for misrouted interrupts.
@@ -136,9 +136,9 @@ static void report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t actio
 void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret,
                         struct pt_regs *regs)
 {
-        if (action_ret != IRQ_HANDLED) {
+        if (unlikely(action_ret != IRQ_HANDLED)) {
                 desc->irqs_unhandled++;
-                if (action_ret != IRQ_NONE)
+                if (unlikely(action_ret != IRQ_NONE))
                         report_bad_irq(irq, desc, action_ret);
         }
 
@@ -152,11 +152,11 @@ void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret,
         }
 
         desc->irq_count++;
-        if (desc->irq_count < 100000)
+        if (likely(desc->irq_count < 100000))
                 return;
 
         desc->irq_count = 0;
-        if (desc->irqs_unhandled > 99900) {
+        if (unlikely(desc->irqs_unhandled > 99900)) {
                 /*
                  * The interrupt is stuck
                  */
@@ -171,7 +171,7 @@ void note_interrupt(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret,
         desc->irqs_unhandled = 0;
 }
 
-int noirqdebug;
+int noirqdebug __read_mostly;
 
 int __init noirqdebug_setup(char *str)
 {