projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into timers/urgent, to pick up fixes
[deliverable/linux.git]
/
arch
/
mips
/
dec
/
reset.c
diff --git
a/arch/mips/dec/reset.c
b/arch/mips/dec/reset.c
index 56397227adb09d20a8a031c0c40ac07c925f2d57..c15a879046e5ca906809a61c4612a2627f6b6663 100644
(file)
--- a/
arch/mips/dec/reset.c
+++ b/
arch/mips/dec/reset.c
@@
-9,26
+9,26
@@
#include <asm/addrspace.h>
#include <asm/addrspace.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();
}
{
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();
}
{
back_to_prom();
}
-void
ATTRIB_NORET
dec_machine_halt(void)
+void
__noreturn
dec_machine_halt(void)
{
back_to_prom();
}
{
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();
{
/* DECstations don't have a software power switch */
back_to_prom();
This page took
0.02546 seconds
and
5
git commands to generate.