summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2015-05-14 14:36:55 +0200
committerJesper Nilsson <jespern@axis.com>2015-09-05 00:33:24 +0200
commit98a725a57a8e92bfbe962a8c69975ce0f9ff11fe (patch)
treecdb477ec15956d0fb1191db240f202aaf8c804f1 /arch/cris
parent6a4756f6951f97a9a601ba24632c5906750ef00d (diff)
downloadlinux-98a725a57a8e92bfbe962a8c69975ce0f9ff11fe.tar.gz
linux-98a725a57a8e92bfbe962a8c69975ce0f9ff11fe.tar.bz2
linux-98a725a57a8e92bfbe962a8c69975ce0f9ff11fe.zip
CRISv32: add unreachable() to BUG()
Add an unreachable() in the BUG() implementations, to get rid of several warnings similar to the one below: kernel/sched/core.c: In function 'pick_next_task': kernel/sched/core.c:2690:1: warning: control reaches end of non-void function [-Wreturn-type] Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Jesper Nilsson <jespern@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/include/arch-v32/arch/bug.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/cris/include/arch-v32/arch/bug.h b/arch/cris/include/arch-v32/arch/bug.h
index 0f211e135248..fb59faaaae0a 100644
--- a/arch/cris/include/arch-v32/arch/bug.h
+++ b/arch/cris/include/arch-v32/arch/bug.h
@@ -10,6 +10,7 @@
* All other stuff is done out-of-band with exception handlers.
*/
#define BUG() \
+do { \
__asm__ __volatile__ ("0: break 14\n\t" \
".section .fixup,\"ax\"\n" \
"1:\n\t" \
@@ -21,9 +22,15 @@
".section __ex_table,\"a\"\n\t" \
".dword 0b, 1b\n\t" \
".previous\n\t" \
- : : "ri" (__FILE__), "i" (__LINE__))
+ : : "ri" (__FILE__), "i" (__LINE__)); \
+ unreachable(); \
+} while (0)
#else
-#define BUG() __asm__ __volatile__ ("break 14\n\t")
+#define BUG() \
+do { \
+ __asm__ __volatile__ ("break 14\n\t"); \
+ unreachable(); \
+} while (0)
#endif
#define HAVE_ARCH_BUG