diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/mips/include/asm/bug.h | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/mips/include/asm/bug.h')
| -rw-r--r-- | arch/mips/include/asm/bug.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/include/asm/bug.h b/arch/mips/include/asm/bug.h index 6cf29c26e873..540c98a810d1 100644 --- a/arch/mips/include/asm/bug.h +++ b/arch/mips/include/asm/bug.h | |||
| @@ -11,9 +11,7 @@ | |||
| 11 | static inline void __noreturn BUG(void) | 11 | static inline void __noreturn BUG(void) |
| 12 | { | 12 | { |
| 13 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); | 13 | __asm__ __volatile__("break %0" : : "i" (BRK_BUG)); |
| 14 | /* Fool GCC into thinking the function doesn't return. */ | 14 | unreachable(); |
| 15 | while (1) | ||
| 16 | ; | ||
| 17 | } | 15 | } |
| 18 | 16 | ||
| 19 | #define HAVE_ARCH_BUG | 17 | #define HAVE_ARCH_BUG |