leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse Source 
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Make BUG() __noreturn.
This commit is contained in:
Linus Torvalds 2008-11-30 10:38:22 -08:00
commit 16799c6a4d
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/mips/include/asm/bug.h
View File

@ -7,20 +7,31 @@
#include <asm/break.h> #include <asm/break.h>
#define BUG() \ static inline void __noreturn BUG(void)
do { \ {
__asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ __asm__ __volatile__("break %0" : : "i" (BRK_BUG));
} while (0) /* Fool GCC into thinking the function doesn't return. */
while (1)
;
}
#define HAVE_ARCH_BUG #define HAVE_ARCH_BUG
#if (_MIPS_ISA > _MIPS_ISA_MIPS1) #if (_MIPS_ISA > _MIPS_ISA_MIPS1)
#define BUG_ON(condition) \ static inline void __BUG_ON(unsigned long condition)
do { \ {
__asm__ __volatile__("tne $0, %0, %1" \ if (__builtin_constant_p(condition)) {
: : "r" (condition), "i" (BRK_BUG)); \ if (condition)
} while (0) BUG();
else
return;
}
__asm__ __volatile__("tne $0, %0, %1"
: : "r" (condition), "i" (BRK_BUG));
}
#define BUG_ON(C) __BUG_ON((unsigned long)(C))
#define HAVE_ARCH_BUG_ON #define HAVE_ARCH_BUG_ON