diff options
author | Robert P. J. Day <rpjday@mindspring.com> | 2007-05-25 14:32:28 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:32:56 -0400 |
commit | b3f6df9f21c6efc4641613188204aa0742bc9e22 (patch) | |
tree | 377d574d3757c58852a106dae7b3454db300205f /arch/mips/kernel | |
parent | 8f8771a057bff0d3911459d0bdadf03ec1dd3c89 (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/kernel')
-rw-r--r-- | arch/mips/kernel/process.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/traps.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 6bdfb5a9fa1a..8f4cf27c7157 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c | |||
@@ -46,7 +46,7 @@ | |||
46 | * power and have a low exit latency (ie sit in a loop waiting for somebody to | 46 | * power and have a low exit latency (ie sit in a loop waiting for somebody to |
47 | * say that they'd like to reschedule) | 47 | * say that they'd like to reschedule) |
48 | */ | 48 | */ |
49 | ATTRIB_NORET void cpu_idle(void) | 49 | void __noreturn cpu_idle(void) |
50 | { | 50 | { |
51 | /* endless idle loop with no priority at all */ | 51 | /* endless idle loop with no priority at all */ |
52 | while (1) { | 52 | while (1) { |
@@ -213,7 +213,7 @@ int dump_task_fpu (struct task_struct *t, elf_fpregset_t *fpr) | |||
213 | /* | 213 | /* |
214 | * Create a kernel thread | 214 | * Create a kernel thread |
215 | */ | 215 | */ |
216 | static ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *)) | 216 | static void __noreturn kernel_thread_helper(void *arg, int (*fn)(void *)) |
217 | { | 217 | { |
218 | do_exit(fn(arg)); | 218 | do_exit(fn(arg)); |
219 | } | 219 | } |
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index a1b017f2dbb3..be7362bc2c9a 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c | |||
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(phys_cpu_present_map); | |||
52 | EXPORT_SYMBOL(cpu_online_map); | 52 | EXPORT_SYMBOL(cpu_online_map); |
53 | 53 | ||
54 | extern void __init calibrate_delay(void); | 54 | extern void __init calibrate_delay(void); |
55 | extern ATTRIB_NORET void cpu_idle(void); | 55 | extern void cpu_idle(void); |
56 | 56 | ||
57 | /* | 57 | /* |
58 | * First C code run on the secondary CPUs after being started up by | 58 | * First C code run on the secondary CPUs after being started up by |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 3ea7863c4519..20bdbe48839b 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c | |||
@@ -311,7 +311,7 @@ void show_registers(struct pt_regs *regs) | |||
311 | 311 | ||
312 | static DEFINE_SPINLOCK(die_lock); | 312 | static DEFINE_SPINLOCK(die_lock); |
313 | 313 | ||
314 | NORET_TYPE void ATTRIB_NORET die(const char * str, struct pt_regs * regs) | 314 | void __noreturn die(const char * str, struct pt_regs * regs) |
315 | { | 315 | { |
316 | static int die_counter; | 316 | static int die_counter; |
317 | #ifdef CONFIG_MIPS_MT_SMTC | 317 | #ifdef CONFIG_MIPS_MT_SMTC |