diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2014-05-16 23:25:52 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-18 19:01:30 -0700 |
commit | 9c2d84deecc714075e5e0294ea662bcf1f6f2d30 (patch) | |
tree | 68969421f5cce2cebb9c30931081ba4dcfc37d34 /arch/sparc | |
parent | 2e74a74f271f4d3fc768b6f06bd72eb57eac36ac (diff) | |
download | talos-op-linux-9c2d84deecc714075e5e0294ea662bcf1f6f2d30.tar.gz talos-op-linux-9c2d84deecc714075e5e0294ea662bcf1f6f2d30.zip |
sparc64: fix sparse warning in traps_64.c
Fix following warning:
traps_64.c:2384:6: error: symbol 'die_if_kernel' redeclared with different type (originally declared at include/asm/bug.h:23) - different modifiers
Add proper __noreturn to the implementation to fix this
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/traps_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 4d7e12ddecd0..864847042ec4 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c @@ -2381,7 +2381,7 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw) return (struct reg_window *) (fp + STACK_BIAS); } -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; |