提交 b3f6df9f 编写于 作者: R Robert P. J. Day 提交者: Ralf Baechle

[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: NRobert P. J. Day <rpjday@mindspring.com>
Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
上级 8f8771a0
......@@ -86,7 +86,7 @@ void __init which_prom(s32 magic, s32 *prom_vec)
void __init prom_init(void)
{
extern void ATTRIB_NORET dec_machine_halt(void);
extern void dec_machine_halt(void);
static char cpu_msg[] __initdata =
"Sorry, this kernel is compiled for a wrong CPU type!\n";
s32 argc = fw_arg0;
......
......@@ -9,26 +9,26 @@
#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();
}
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();
......
......@@ -46,7 +46,7 @@
* power and have a low exit latency (ie sit in a loop waiting for somebody to
* say that they'd like to reschedule)
*/
ATTRIB_NORET void cpu_idle(void)
void __noreturn cpu_idle(void)
{
/* endless idle loop with no priority at all */
while (1) {
......@@ -213,7 +213,7 @@ int dump_task_fpu (struct task_struct *t, elf_fpregset_t *fpr)
/*
* Create a kernel thread
*/
static ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
static void __noreturn kernel_thread_helper(void *arg, int (*fn)(void *))
{
do_exit(fn(arg));
}
......
......@@ -52,7 +52,7 @@ EXPORT_SYMBOL(phys_cpu_present_map);
EXPORT_SYMBOL(cpu_online_map);
extern void __init calibrate_delay(void);
extern ATTRIB_NORET void cpu_idle(void);
extern void cpu_idle(void);
/*
* First C code run on the secondary CPUs after being started up by
......
......@@ -311,7 +311,7 @@ void show_registers(struct pt_regs *regs)
static DEFINE_SPINLOCK(die_lock);
NORET_TYPE void ATTRIB_NORET die(const char * str, struct pt_regs * regs)
void __noreturn die(const char * str, struct pt_regs * regs)
{
static int die_counter;
#ifdef CONFIG_MIPS_MT_SMTC
......
......@@ -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();
......
......@@ -62,7 +62,7 @@ extern unsigned long initrd_start, initrd_end;
extern int kgdb_port;
#endif
static void ATTRIB_NORET cfe_linux_exit(void *arg)
static void __noreturn cfe_linux_exit(void *arg)
{
int warm = *(int *)arg;
......@@ -83,14 +83,14 @@ static void ATTRIB_NORET cfe_linux_exit(void *arg)
while (1);
}
static void ATTRIB_NORET cfe_linux_restart(char *command)
static void __noreturn cfe_linux_restart(char *command)
{
static const int zero;
cfe_linux_exit((void *)&zero);
}
static void ATTRIB_NORET cfe_linux_halt(void)
static void __noreturn cfe_linux_halt(void)
{
static const int one = 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册