aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/sgi-ip22/ip22-reset.c
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-05-25 14:32:28 -0400
committerRalf Baechle <ralf@linux-mips.org>2007-07-10 17:32:56 +0100
commitb3f6df9f21c6efc4641613188204aa0742bc9e22 (patch)
tree377d574d3757c58852a106dae7b3454db300205f /arch/mips/sgi-ip22/ip22-reset.c
parent8f8771a057bff0d3911459d0bdadf03ec1dd3c89 (diff)
[MIPS] Transform old-style macros to newer "__noreturn"
Convert old/obsolete NORET_TYPE and ATTRIB_NORET macros to use the newer standard of "__noreturn" as defined in compiler-gcc.h. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sgi-ip22/ip22-reset.c')
-rw-r--r--arch/mips/sgi-ip22/ip22-reset.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index 66df5ac8f08..63afd7e4442 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -46,7 +46,7 @@ static struct timer_list power_timer, blink_timer, debounce_timer, volume_timer;
static int machine_state;
-static void ATTRIB_NORET sgi_machine_power_off(void)
+static void __noreturn sgi_machine_power_off(void)
{
unsigned int tmp;
@@ -68,7 +68,7 @@ static void ATTRIB_NORET sgi_machine_power_off(void)
}
}
-static void ATTRIB_NORET sgi_machine_restart(char *command)
+static void __noreturn sgi_machine_restart(char *command)
{
if (machine_state & MACHINE_SHUTTING_DOWN)
sgi_machine_power_off();
@@ -76,7 +76,7 @@ static void ATTRIB_NORET sgi_machine_restart(char *command)
while (1);
}
-static void ATTRIB_NORET sgi_machine_halt(void)
+static void __noreturn sgi_machine_halt(void)
{
if (machine_state & MACHINE_SHUTTING_DOWN)
sgi_machine_power_off();