Merge remote-tracking branch 'mips/mips-for-linux-next'

[karo-tx-linux.git] / arch / metag / kernel / smp.c

diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c
index ac3a199e33e714d772f688b7f9620cb964d29a0f..c3c6f086488169cc06e53b1eb6eb07ea6b2e68ee 100644 (file)
--- a/arch/metag/kernel/smp.c
+++ b/arch/metag/kernel/smp.c
@@ -312,6 +312,7 @@ void cpu_die(void)
 {
        local_irq_disable();
        idle_task_exit();
+       irq_ctx_exit(smp_processor_id());
 
        (void)cpu_report_death();
 
@@ -366,6 +367,7 @@ asmlinkage void secondary_start_kernel(void)
                panic("No TBI found!");
 
        per_cpu_trap_init(cpu);
+       irq_ctx_init(cpu);
 
        preempt_disable();