diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /arch/mips/include/asm/bug.h | |
| parent | d29cecda036f251aee4947f47eea0fe9ed8cc931 (diff) | |
| parent | 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
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 6cf29c26e87..540c98a810d 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 |