Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / mips / kernel / irq.c

diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index f25f7eab7307e92ec22a17228a7afba68cd5327c..ba150c755fccebe8ed3e60fc3af89fa8cd943bfa 100644 (file)
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -23,7 +23,9 @@
 #include <linux/ftrace.h>
 
 #include <linux/atomic.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
+
+void *irq_stack[NR_CPUS];
 
 /*
  * 'what should we do if we get a hw irq event on an illegal vector'.
@@ -58,6 +60,15 @@ void __init init_IRQ(void)
                clear_c0_status(ST0_IM);
 
        arch_init_irq();
+
+       for_each_possible_cpu(i) {
+               int irq_pages = IRQ_STACK_SIZE / PAGE_SIZE;
+               void *s = (void *)__get_free_pages(GFP_KERNEL, irq_pages);
+
+               irq_stack[i] = s;
+               pr_debug("CPU%d IRQ stack at 0x%p - 0x%p\n", i,
+                       irq_stack[i], irq_stack[i] + IRQ_STACK_SIZE);
+       }
 }
 
 #ifdef CONFIG_DEBUG_STACKOVERFLOW