Commit fcd0196b authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc32: fix sparse warning in traps_32.c 



Fix following warning:
traps_32.c:47:6: error: symbol 'die_if_kernel' redeclared with different type - different modifiers

Add __noreturn to both definition and declaration

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2b0aa94

arch/sparc/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ extern void do_BUG(const char *file, int line); 
#include <asm-generic/bug.h>



struct pt_regs;

extern void die_if_kernel(char *str, struct pt_regs *regs) __attribute__ ((noreturn));

void __noreturn die_if_kernel(char *str, struct pt_regs *regs);



#endif

arch/sparc/kernel/traps_32.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static void instruction_dump(unsigned long *pc) 
#define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")

#define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")



void die_if_kernel(char *str, struct pt_regs *regs)

void __noreturn die_if_kernel(char *str, struct pt_regs *regs)

{

	static int die_counter;

	int count = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE