mirror of https://gitee.com/openkylin/linux.git
treewide: convert uses of ATTRIB_NORETURN to __noreturn
Use the more commonly used __noreturn instead of ATTRIB_NORETURN. [akpm@linux-foundation.org: coding-style fixes] 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:
parent
9402c95f34
commit
ff2d8b19a3
|
@ -31,7 +31,7 @@ typedef void (*relocate_new_kernel_t)(
|
|||
unsigned long indirection_page,
|
||||
unsigned long start_address,
|
||||
struct ia64_boot_param *boot_param,
|
||||
unsigned long pal_addr) ATTRIB_NORET;
|
||||
unsigned long pal_addr) __noreturn;
|
||||
|
||||
struct kimage *ia64_kimage;
|
||||
|
||||
|
|
|
@ -511,8 +511,7 @@ static unsigned long amiga_gettimeoffset(void)
|
|||
return ticks + offset;
|
||||
}
|
||||
|
||||
static void amiga_reset(void)
|
||||
ATTRIB_NORET;
|
||||
static void amiga_reset(void) __noreturn;
|
||||
|
||||
static void amiga_reset(void)
|
||||
{
|
||||
|
|
|
@ -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_leave(struct pt_regs *regs);
|
||||
|
||||
extern void die(const char *, struct pt_regs *) ATTRIB_NORET;
|
||||
extern void die(const char *, struct pt_regs *) __noreturn;
|
||||
|
||||
static inline void die_if_kernel(const char *str, struct pt_regs *regs)
|
||||
{
|
||||
|
|
|
@ -1340,7 +1340,7 @@ void ejtag_exception_handler(struct pt_regs *regs)
|
|||
/*
|
||||
* NMI exception handler.
|
||||
*/
|
||||
void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
|
||||
void __noreturn nmi_exception_handler(struct pt_regs *regs)
|
||||
{
|
||||
bust_spinlocks(1);
|
||||
printk("NMI taken!!!!\n");
|
||||
|
|
|
@ -110,7 +110,7 @@ extern asmlinkage void nmi_handler(void);
|
|||
extern asmlinkage void misalignment(struct pt_regs *, enum exception_code);
|
||||
|
||||
extern void die(const char *, struct pt_regs *, enum exception_code)
|
||||
ATTRIB_NORET;
|
||||
__noreturn;
|
||||
|
||||
extern int die_if_no_fixup(const char *, struct pt_regs *, enum exception_code);
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
typedef void (*relocate_new_kernel_t)(
|
||||
unsigned long indirection_page,
|
||||
unsigned long reboot_code_buffer,
|
||||
unsigned long start_address) ATTRIB_NORET;
|
||||
unsigned long start_address) __noreturn;
|
||||
|
||||
/*
|
||||
* This is a generic machine_kexec function suitable at least for
|
||||
|
|
|
@ -309,7 +309,7 @@ struct paca_struct kexec_paca;
|
|||
/* Our assembly helper, in kexec_stub.S */
|
||||
extern void kexec_sequence(void *newstack, unsigned long start,
|
||||
void *image, void *control,
|
||||
void (*clear_all)(void)) ATTRIB_NORET;
|
||||
void (*clear_all)(void)) __noreturn;
|
||||
|
||||
/* too late to fail here */
|
||||
void default_machine_kexec(struct kimage *image)
|
||||
|
|
|
@ -236,7 +236,7 @@ static inline unsigned long __rewind_psw(psw_t psw, unsigned long ilc)
|
|||
/*
|
||||
* Function to drop a processor into disabled wait state
|
||||
*/
|
||||
static inline void ATTRIB_NORET disabled_wait(unsigned long code)
|
||||
static inline void __noreturn disabled_wait(unsigned long code)
|
||||
{
|
||||
unsigned long ctl_buf;
|
||||
psw_t dw_psw;
|
||||
|
|
|
@ -70,7 +70,7 @@ void show_regs(struct pt_regs * regs)
|
|||
/*
|
||||
* Create a kernel thread
|
||||
*/
|
||||
ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
|
||||
__noreturn void kernel_thread_helper(void *arg, int (*fn)(void *))
|
||||
{
|
||||
do_exit(fn(arg));
|
||||
}
|
||||
|
|
|
@ -285,7 +285,7 @@ void show_regs(struct pt_regs *regs)
|
|||
/*
|
||||
* Create a kernel thread
|
||||
*/
|
||||
ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
|
||||
__noreturn void kernel_thread_helper(void *arg, int (*fn)(void *))
|
||||
{
|
||||
do_exit(fn(arg));
|
||||
}
|
||||
|
|
|
@ -252,7 +252,7 @@ void machine_kexec(struct kimage *image)
|
|||
{
|
||||
void *reboot_code_buffer;
|
||||
void (*rnk)(unsigned long, void *, unsigned long)
|
||||
ATTRIB_NORET;
|
||||
__noreturn;
|
||||
|
||||
/* Mask all interrupts before starting to reboot. */
|
||||
interrupt_mask_set_mask(~0ULL);
|
||||
|
|
|
@ -187,15 +187,15 @@ extern struct atomic_notifier_head panic_notifier_list;
|
|||
extern long (*panic_blink)(int state);
|
||||
__printf(1, 2)
|
||||
void panic(const char *fmt, ...)
|
||||
ATTRIB_NORET __cold;
|
||||
__noreturn __cold;
|
||||
extern void oops_enter(void);
|
||||
extern void oops_exit(void);
|
||||
void print_oops_end_marker(void);
|
||||
extern int oops_may_print(void);
|
||||
void do_exit(long error_code)
|
||||
ATTRIB_NORET;
|
||||
__noreturn;
|
||||
void complete_and_exit(struct completion *, long)
|
||||
ATTRIB_NORET;
|
||||
__noreturn;
|
||||
|
||||
/* Internal, do not use. */
|
||||
int __must_check _kstrtoul(const char *s, unsigned int base, unsigned long *res);
|
||||
|
|
Loading…
Reference in New Issue