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

Commit ff2d8b19 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

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: default avatarJoe 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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarRalf 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9402c95f

arch/ia64/kernel/machine_kexec.c

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

arch/m68k/amiga/config.c

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

{

arch/mips/include/asm/ptrace.h

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

{

arch/mips/kernel/traps.c

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

arch/mn10300/include/asm/exceptions.h

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