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

Commit b79e88e5 authored by Markos Chandras's avatar Markos Chandras Committed by James Hogan
Browse files

metag/traps: Mark die() as __noreturn to match the declaration. 



Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
parent dca66a61

arch/metag/include/asm/bug.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
struct pt_regs;

struct pt_regs;





extern const char *trap_name(int trapno);

extern const char *trap_name(int trapno);

extern void die(const char *str, struct pt_regs *regs, long err,

extern void __noreturn die(const char *str, struct pt_regs *regs, long err,

		unsigned long addr) __attribute__ ((noreturn));

		unsigned long addr);





#endif
 
#endif

arch/metag/kernel/traps.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -87,8 +87,8 @@ const char *trap_name(int trapno) 




static DEFINE_SPINLOCK(die_lock);

static DEFINE_SPINLOCK(die_lock);





void die(const char *str, struct pt_regs *regs, long err,

void __noreturn die(const char *str, struct pt_regs *regs,

	 unsigned long addr)

		    long err, unsigned long addr)

{

{

	static int die_counter;

	static int die_counter;