Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/include/asm-mips/bug.h b/include/asm-mips/bug.h
index eb94bb96cfbcbcc2389d3a846b774f6b075b6734..4d560a533940603c6955c753b0ba34daec45f905 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,20 @@ 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" : : "r" (condition));         \
+} while (0)
+
+#define HAVE_ARCH_BUG_ON
+
+#endif /* _MIPS_ISA > _MIPS_ISA_MIPS1 */
 
 #endif
+
+#include <asm-generic/bug.h>
+
+#endif /* __ASM_BUG_H */