Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3f6df9f authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Ralf Baechle
Browse files

[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: default avatarRobert P. J. Day <rpjday@mindspring.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8f8771a0

arch/mips/dec/prom/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/mips/dec/reset.c

+5 −5
Original line number Diff line number Diff line
@@ -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();

arch/mips/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

}

arch/mips/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/mips/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -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