korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-19 12:24:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

treewide: remove useless NORET_TYPE macro and uses

Browse Source 
It's a very old and now unused prototype marking so just delete it.

Neaten panic pointer argument style to keep checkpatch quiet.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2012-01-12 17:17:17 -08:00 committed by Linus Torvalds
parent 80bf007f20
commit 9402c95f34
15 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/avr32/include/asm/system.h
View File

@ -169,7 +169,7 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n)) #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
struct pt_regs; struct pt_regs;
void NORET_TYPE die(const char *str, struct pt_regs *regs, long err); void die(const char *str, struct pt_regs *regs, long err);
void _exception(long signr, struct pt_regs *regs, int code, void _exception(long signr, struct pt_regs *regs, int code,
unsigned long addr); unsigned long addr);

2
arch/avr32/kernel/traps.c
View File

@ -24,7 +24,7 @@
static DEFINE_SPINLOCK(die_lock); static DEFINE_SPINLOCK(die_lock);
void NORET_TYPE die(const char *str, struct pt_regs *regs, long err) void die(const char *str, struct pt_regs *regs, long err)
{ {
static int die_counter; static int die_counter;

2
arch/ia64/kernel/machine_kexec.c
View File

@ -27,7 +27,7 @@
#include <asm/sal.h> #include <asm/sal.h>
#include <asm/mca.h> #include <asm/mca.h>
typedef NORET_TYPE void (*relocate_new_kernel_t)( typedef void (*relocate_new_kernel_t)(
unsigned long indirection_page, unsigned long indirection_page,
unsigned long start_address, unsigned long start_address,
struct ia64_boot_param *boot_param, struct ia64_boot_param *boot_param,

2
arch/m68k/amiga/config.c
View File

@ -511,7 +511,7 @@ static unsigned long amiga_gettimeoffset(void)
return ticks + offset; return ticks + offset;
} }
static NORET_TYPE void amiga_reset(void) static void amiga_reset(void)
ATTRIB_NORET; ATTRIB_NORET;
static void amiga_reset(void) static void amiga_reset(void)

2
arch/mips/include/asm/ptrace.h
View File

@ -144,7 +144,7 @@ extern int ptrace_set_watch_regs(struct task_struct *child,
extern asmlinkage void syscall_trace_enter(struct pt_regs *regs); extern asmlinkage void syscall_trace_enter(struct pt_regs *regs);
extern asmlinkage void syscall_trace_leave(struct pt_regs *regs); extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);
extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET; extern void die(const char *, struct pt_regs *) ATTRIB_NORET;
static inline void die_if_kernel(const char *str, struct pt_regs *regs) static inline void die_if_kernel(const char *str, struct pt_regs *regs)
{ {

2
arch/mips/kernel/traps.c
View File

@ -1340,7 +1340,7 @@ void ejtag_exception_handler(struct pt_regs *regs)
/* /*
* NMI exception handler. * NMI exception handler.
*/ */
NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs) void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
{ {
bust_spinlocks(1); bust_spinlocks(1);
printk("NMI taken!!!!\n"); printk("NMI taken!!!!\n");

2
arch/powerpc/kernel/machine_kexec_32.c
View File

@ -16,7 +16,7 @@
#include <asm/hw_irq.h> #include <asm/hw_irq.h>
#include <asm/io.h> #include <asm/io.h>
typedef NORET_TYPE void (*relocate_new_kernel_t)( typedef void (*relocate_new_kernel_t)(
unsigned long indirection_page, unsigned long indirection_page,
unsigned long reboot_code_buffer, unsigned long reboot_code_buffer,
unsigned long start_address) ATTRIB_NORET; unsigned long start_address) ATTRIB_NORET;

6
arch/powerpc/kernel/machine_kexec_64.c
View File

@ -307,9 +307,9 @@ static union thread_union kexec_stack __init_task_data =
struct paca_struct kexec_paca; struct paca_struct kexec_paca;
/* Our assembly helper, in kexec_stub.S */ /* Our assembly helper, in kexec_stub.S */
extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start, extern void kexec_sequence(void *newstack, unsigned long start,
void *image, void *control, void *image, void *control,
void (*clear_all)(void)) ATTRIB_NORET; void (*clear_all)(void)) ATTRIB_NORET;
/* too late to fail here */ /* too late to fail here */
void default_machine_kexec(struct kimage *image) void default_machine_kexec(struct kimage *image)

2
arch/s390/kernel/nmi.c
View File

@ -30,7 +30,7 @@ struct mcck_struct {
static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck); static DEFINE_PER_CPU(struct mcck_struct, cpu_mcck);
static NORET_TYPE void s390_handle_damage(char *msg) static void s390_handle_damage(char *msg)
{ {
smp_send_stop(); smp_send_stop();
disabled_wait((unsigned long) __builtin_return_address(0)); disabled_wait((unsigned long) __builtin_return_address(0));

4
arch/tile/kernel/machine_kexec.c
View File

@ -248,10 +248,10 @@ static void setup_quasi_va_is_pa(void)
} }
NORET_TYPE void machine_kexec(struct kimage *image) void machine_kexec(struct kimage *image)
{ {
void *reboot_code_buffer; void *reboot_code_buffer;
NORET_TYPE void (*rnk)(unsigned long, void *, unsigned long) void (*rnk)(unsigned long, void *, unsigned long)
ATTRIB_NORET; ATTRIB_NORET;
/* Mask all interrupts before starting to reboot. */ /* Mask all interrupts before starting to reboot. */

6
include/linux/kernel.h
View File

@ -185,16 +185,16 @@ static inline void might_fault(void)
extern struct atomic_notifier_head panic_notifier_list; extern struct atomic_notifier_head panic_notifier_list;
extern long (*panic_blink)(int state); extern long (*panic_blink)(int state);
NORET_TYPE __printf(1, 2) __printf(1, 2)
void panic(const char *fmt, ...) void panic(const char *fmt, ...)
ATTRIB_NORET __cold; ATTRIB_NORET __cold;
extern void oops_enter(void); extern void oops_enter(void);
extern void oops_exit(void); extern void oops_exit(void);
void print_oops_end_marker(void); void print_oops_end_marker(void);
extern int oops_may_print(void); extern int oops_may_print(void);
NORET_TYPE void do_exit(long error_code) void do_exit(long error_code)
ATTRIB_NORET; ATTRIB_NORET;
NORET_TYPE void complete_and_exit(struct completion *, long) void complete_and_exit(struct completion *, long)
ATTRIB_NORET; ATTRIB_NORET;
/* Internal, do not use. */ /* Internal, do not use. */

1
include/linux/linkage.h
View File

@ -88,7 +88,6 @@
#endif #endif
#define NORET_TYPE /**/
#define ATTRIB_NORET __attribute__((noreturn)) #define ATTRIB_NORET __attribute__((noreturn))
#endif #endif

2
include/linux/sched.h
View File

@ -2275,7 +2275,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
extern void exit_itimers(struct signal_struct *); extern void exit_itimers(struct signal_struct *);
extern void flush_itimer_signals(void); extern void flush_itimer_signals(void);
extern NORET_TYPE void do_group_exit(int); extern void do_group_exit(int);
extern void daemonize(const char *, ...); extern void daemonize(const char *, ...);
extern int allow_signal(int); extern int allow_signal(int);

6
kernel/exit.c
View File

@ -887,7 +887,7 @@ static void check_stack_usage(void)
static inline void check_stack_usage(void) {} static inline void check_stack_usage(void) {}
#endif #endif
NORET_TYPE void do_exit(long code) void do_exit(long code)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
int group_dead; int group_dead;
@ -1051,7 +1051,7 @@ NORET_TYPE void do_exit(long code)
EXPORT_SYMBOL_GPL(do_exit); EXPORT_SYMBOL_GPL(do_exit);
NORET_TYPE void complete_and_exit(struct completion *comp, long code) void complete_and_exit(struct completion *comp, long code)
{ {
if (comp) if (comp)
complete(comp); complete(comp);
@ -1070,7 +1070,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
* Take down every thread in the group. This is called by fatal signals * Take down every thread in the group. This is called by fatal signals
* as well as by sys_exit_group (below). * as well as by sys_exit_group (below).
*/ */
NORET_TYPE void void
do_group_exit(int exit_code) do_group_exit(int exit_code)
{ {
struct signal_struct *sig = current->signal; struct signal_struct *sig = current->signal;

2
kernel/panic.c
View File

@ -57,7 +57,7 @@ EXPORT_SYMBOL(panic_blink);
* *
* This function never returns. * This function never returns.
*/ */
NORET_TYPE void panic(const char * fmt, ...) void panic(const char *fmt, ...)
{ {
static char buf[1024]; static char buf[1024];
va_list args; va_list args;