sparc32: fix sparse warning in traps_32.c

PATCH In review Sam Ravnborg 1 participant 1 message Apr 21, 2014 SPARC + UltraSPARC (sparc/sparc64)

Share & tools

Sam Ravnborg

author

2014-04-21 17:12 UTC #0 lore raw

PATCH 1/24 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 Sam Ravnborg <[email protected]>

---
 arch/sparc/include/asm/bug.h | 2 +-
 arch/sparc/kernel/traps_32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

arch/sparc/include/asm/bug.h +1 -1

index 6bd9f43..8b50230 100644
@@ -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));
+extern void __noreturn die_if_kernel(char *str, struct pt_regs *regs);
 
 #endif

arch/sparc/kernel/traps_32.c +1 -1

index 6629829..a655e5b 100644
@@ -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;

Signature · 1 line

1.8.3.1