powerpc: Make ppc_md.{halt, restart} __noreturn
powernv marks it's halt and restart calls as __noreturn. However, ppc_md does not have this annotation. Add the annotation to ppc_md, and then to every halt/restart function that is missing it. Additionally, I have verified that all of these functions do not return. Occasionally I have added a spin loop to be sure. Signed-off-by: Daniel Axtens <dja@axtens.net> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:

committed by
Michael Ellerman

parent
62c2c5cf38
commit
95ec77c06e
@@ -94,7 +94,7 @@ static unsigned long maple_find_nvram_base(void)
|
||||
return result;
|
||||
}
|
||||
|
||||
static void maple_restart(char *cmd)
|
||||
static void __noreturn maple_restart(char *cmd)
|
||||
{
|
||||
unsigned int maple_nvram_base;
|
||||
const unsigned int *maple_nvram_offset, *maple_nvram_command;
|
||||
@@ -119,9 +119,10 @@ static void maple_restart(char *cmd)
|
||||
for (;;) ;
|
||||
fail:
|
||||
printk(KERN_EMERG "Maple: Manual Restart Required\n");
|
||||
for (;;) ;
|
||||
}
|
||||
|
||||
static void maple_power_off(void)
|
||||
static void __noreturn maple_power_off(void)
|
||||
{
|
||||
unsigned int maple_nvram_base;
|
||||
const unsigned int *maple_nvram_offset, *maple_nvram_command;
|
||||
@@ -146,9 +147,10 @@ static void maple_power_off(void)
|
||||
for (;;) ;
|
||||
fail:
|
||||
printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
|
||||
for (;;) ;
|
||||
}
|
||||
|
||||
static void maple_halt(void)
|
||||
static void __noreturn maple_halt(void)
|
||||
{
|
||||
maple_power_off();
|
||||
}
|
||||
|
Reference in New Issue
Block a user