metag/traps: include setup.h for the per_cpu_trap_init declaration

[~andy/linux] / arch / metag / kernel / traps.c

diff --git a/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c
index 2ceeaae5b1992e11a731c6eba9450a8dece9aeb3..c00ade0228ef8f11ff140577f0e712956e0003ee 100644 (file)
--- a/arch/metag/kernel/traps.c
+++ b/arch/metag/kernel/traps.c
@@ -33,6 +33,7 @@
 #include <asm/siginfo.h>
 #include <asm/traps.h>
 #include <asm/hwthread.h>
+#include <asm/setup.h>
 #include <asm/switch.h>
 #include <asm/user_gateway.h>
 #include <asm/syscall.h>
@@ -87,8 +88,8 @@ const char *trap_name(int trapno)
 
 static DEFINE_SPINLOCK(die_lock);
 
-void die(const char *str, struct pt_regs *regs, long err,
-        unsigned long addr)
+void __noreturn die(const char *str, struct pt_regs *regs,
+                   long err, unsigned long addr)
 {
        static int die_counter;