X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fmips%2Fdec%2Freset.c;h=c15a879046e5ca906809a61c4612a2627f6b6663;hb=fdbdfefbabefcdf3f57560163b43fdc4cf95eb2f;hp=f78c6da479217c7f806560a27c6b63c3fbcbec5f;hpb=849a8924a6740ecbf9711e015beca69425f0c429;p=deliverable%2Flinux.git

diff --git a/arch/mips/dec/reset.c b/arch/mips/dec/reset.c
index f78c6da47921..c15a879046e5 100644
--- a/arch/mips/dec/reset.c
+++ b/arch/mips/dec/reset.c
@@ -8,34 +8,33 @@
 #include <linux/linkage.h>
 
 #include <asm/addrspace.h>
-#include <asm/ptrace.h>
 
-typedef void ATTRIB_NORET (* noret_func_t)(void);
+typedef void __noreturn (* noret_func_t)(void);
 
-static inline void ATTRIB_NORET back_to_prom(void)
+static inline void __noreturn back_to_prom(void)
 {
 	noret_func_t func = (void *)CKSEG1ADDR(0x1fc00000);
 
 	func();
 }
 
-void ATTRIB_NORET dec_machine_restart(char *command)
+void __noreturn dec_machine_restart(char *command)
 {
 	back_to_prom();
 }
 
-void ATTRIB_NORET dec_machine_halt(void)
+void __noreturn dec_machine_halt(void)
 {
 	back_to_prom();
 }
 
-void ATTRIB_NORET dec_machine_power_off(void)
+void __noreturn dec_machine_power_off(void)
 {
     /* DECstations don't have a software power switch */
 	back_to_prom();
 }
 
-irqreturn_t dec_intr_halt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t dec_intr_halt(int irq, void *dev_id)
 {
 	dec_machine_halt();
 }