diff options
author | Tejun Heo <tj@kernel.org> | 2015-11-03 17:29:03 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2015-11-03 17:29:03 -0500 |
commit | 159b5bb46492e4dcef2070b12861030bc360402b (patch) | |
tree | 93de7d6e94a059aade50ee5437de6a50ccd1cf7b /arch/cris/include/arch-v32/arch/bug.h | |
parent | 56e74338a535cbcc2f2da08b1ea1a92920194364 (diff) | |
parent | 469eabb3aec03d9defed3462df743a223a5c8f54 (diff) |
Merge branch 'for-4.3-fixes' into for-4.4
Diffstat (limited to 'arch/cris/include/arch-v32/arch/bug.h')
-rw-r--r-- | arch/cris/include/arch-v32/arch/bug.h | 11 |
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 |