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

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

treewide: remove useless NORET_TYPE macro and uses 



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: 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 80bf007f

arch/avr32/include/asm/system.h

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

arch/avr32/kernel/traps.c

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

arch/ia64/kernel/machine_kexec.c

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

arch/m68k/amiga/config.c

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

arch/mips/include/asm/ptrace.h

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

{

{