Merge branch 'for-linus' into for-next

Merge pending fixes that haven't pulled into 3.8.

1 files changed, 4 insertions, 2 deletions

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index c0b1affc06a8..0299d63cd112 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -410,11 +410,13 @@ void __init init_IRQ(void)
 {
         local_irq_disable();    /* PARANOID - should already be disabled */
         mtctl(~0UL, 23);        /* EIRR : clear all pending external intr */
-        claim_cpu_irqs();
 #ifdef CONFIG_SMP
-        if (!cpu_eiem)
+        if (!cpu_eiem) {
+                claim_cpu_irqs();
                 cpu_eiem = EIEM_MASK(IPI_IRQ) | EIEM_MASK(TIMER_IRQ);
+        }
 #else
+        claim_cpu_irqs();
         cpu_eiem = EIEM_MASK(TIMER_IRQ);
 #endif
         set_eiem(cpu_eiem);     /* EIEM : enable all external intr */