X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fmips%2Fkernel%2Ftraps.c;h=725e9a5ca966a3e1211f6abe88a3ad89e6006768;hb=9402c95f34a66e81eba473a2f7267bbae5a1dee2;hp=5c8a49d55054dffce696066bad88d1863c5e7f35;hpb=80bf007f20b16272f210e0803f739f5606cff59d;p=deliverable%2Flinux.git

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 5c8a49d55054..725e9a5ca966 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1340,7 +1340,7 @@ void ejtag_exception_handler(struct pt_regs *regs)
 /*
  * NMI exception handler.
  */
-NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
+void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
 {
 	bust_spinlocks(1);
 	printk("NMI taken!!!!\n");