2 files changed, 7 insertions, 0 deletions

diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 8417a914e8a3..2f538ac2e139 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -345,6 +345,9 @@ void __init leon_init_timers(irq_handler_t counter_fn)
         icsel = (icsel >> ((7 - (boot_cpu_id&0x7)) * 4)) & 0xf;
         leon3_irqctrl_regs += icsel;
 
+        /* Mask all IRQs on boot-cpu IRQ controller */
+        LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[boot_cpu_id], 0);
+
         /* Probe extended IRQ controller */
         eirq = (LEON3_BYPASS_LOAD_PA(&leon3_irqctrl_regs->mpstatus)
                 >> 16) & 0xf;
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index cbd8e31d01ff..de9506d9ad7d 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -217,6 +217,10 @@ int __cpuinit leon_boot_one_cpu(int i)
                (unsigned int)&leon3_irqctrl_regs->mpstatus);
         local_flush_cache_all();
 
+        /* Make sure all IRQs are of from the start for this new CPU */
+        LEON_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[i], 0);
+
+        /* Wake one CPU */
         LEON_BYPASS_STORE_PA(&(leon3_irqctrl_regs->mpstatus), 1 << i);
 
         /* wheee... it's going... */