Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / include / asm-mips / bug.h

diff --git a/include/asm-mips/bug.h b/include/asm-mips/bug.h
index eb94bb96cfbcbcc2389d3a846b774f6b075b6734..7eb63de808bc153cf3f14ed5b2f180365f0f168b 100644 (file)
--- a/include/asm-mips/bug.h
+++ b/include/asm-mips/bug.h
@@ -1,6 +1,10 @@
 #ifndef __ASM_BUG_H
 #define __ASM_BUG_H
 
+#include <asm/sgidefs.h>
+
+#ifdef CONFIG_BUG
+
 #include <asm/break.h>
 
 #define BUG()                                                          \
@@ -9,6 +13,21 @@ do {                                                                  \
 } while (0)
 
 #define HAVE_ARCH_BUG
-#include <asm-generic/bug.h>
+
+#if (_MIPS_ISA > _MIPS_ISA_MIPS1)
+
+#define BUG_ON(condition)                                              \
+do {                                                                   \
+       __asm__ __volatile__("tne $0, %0, %1"                           \
+                            : : "r" (condition), "i" (BRK_BUG));       \
+} while (0)
+
+#define HAVE_ARCH_BUG_ON
+
+#endif /* _MIPS_ISA > _MIPS_ISA_MIPS1 */
 
 #endif
+
+#include <asm-generic/bug.h>
+
+#endif /* __ASM_BUG_H */