diff options
Diffstat (limited to 'arch/mips/dec')
-rw-r--r-- | arch/mips/dec/prom/init.c | 2 | ||||
-rw-r--r-- | arch/mips/dec/reset.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c index a217aafe59f6..4828cac4748f 100644 --- a/arch/mips/dec/prom/init.c +++ b/arch/mips/dec/prom/init.c | |||
@@ -86,7 +86,7 @@ void __init which_prom(s32 magic, s32 *prom_vec) | |||
86 | 86 | ||
87 | void __init prom_init(void) | 87 | void __init prom_init(void) |
88 | { | 88 | { |
89 | extern void ATTRIB_NORET dec_machine_halt(void); | 89 | extern void dec_machine_halt(void); |
90 | static char cpu_msg[] __initdata = | 90 | static char cpu_msg[] __initdata = |
91 | "Sorry, this kernel is compiled for a wrong CPU type!\n"; | 91 | "Sorry, this kernel is compiled for a wrong CPU type!\n"; |
92 | s32 argc = fw_arg0; | 92 | s32 argc = fw_arg0; |
diff --git a/arch/mips/dec/reset.c b/arch/mips/dec/reset.c index 56397227adb0..c15a879046e5 100644 --- a/arch/mips/dec/reset.c +++ b/arch/mips/dec/reset.c | |||
@@ -9,26 +9,26 @@ | |||
9 | 9 | ||
10 | #include <asm/addrspace.h> | 10 | #include <asm/addrspace.h> |
11 | 11 | ||
12 | typedef void ATTRIB_NORET (* noret_func_t)(void); | 12 | typedef void __noreturn (* noret_func_t)(void); |
13 | 13 | ||
14 | static inline void ATTRIB_NORET back_to_prom(void) | 14 | static inline void __noreturn back_to_prom(void) |
15 | { | 15 | { |
16 | noret_func_t func = (void *)CKSEG1ADDR(0x1fc00000); | 16 | noret_func_t func = (void *)CKSEG1ADDR(0x1fc00000); |
17 | 17 | ||
18 | func(); | 18 | func(); |
19 | } | 19 | } |
20 | 20 | ||
21 | void ATTRIB_NORET dec_machine_restart(char *command) | 21 | void __noreturn dec_machine_restart(char *command) |
22 | { | 22 | { |
23 | back_to_prom(); | 23 | back_to_prom(); |
24 | } | 24 | } |
25 | 25 | ||
26 | void ATTRIB_NORET dec_machine_halt(void) | 26 | void __noreturn dec_machine_halt(void) |
27 | { | 27 | { |
28 | back_to_prom(); | 28 | back_to_prom(); |
29 | } | 29 | } |
30 | 30 | ||
31 | void ATTRIB_NORET dec_machine_power_off(void) | 31 | void __noreturn dec_machine_power_off(void) |
32 | { | 32 | { |
33 | /* DECstations don't have a software power switch */ | 33 | /* DECstations don't have a software power switch */ |
34 | back_to_prom(); | 34 | back_to_prom(); |