From f9d259d70bffb635f6e0c00a7167502a01b71572 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier.adi@gmail.com>
Date: Thu, 24 Apr 2008 08:58:44 +0800
Subject: [PATCH] --- yaml --- r: 92327 b: refs/heads/master c:
 2d191233882a031304f41cfc6abfb70536780645 h: refs/heads/master i:   92325:
 fe849d1d1e63d8c48878882bd5a840c98d3fca7b   92323:
 1f669af41ea4c7be015575fde7b6170f5fb292d5   92319:
 7352777896fcaa7017d002b77bfa5da73acc5bfb v: v3

---
 [refs]                           |  2 +-
 trunk/include/asm-blackfin/bug.h | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4ff23c6f793c..0672ed8c9cc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e9d5c7daff8b74bf3be62cfe0ba48b5af1fa12f
+refs/heads/master: 2d191233882a031304f41cfc6abfb70536780645
diff --git a/trunk/include/asm-blackfin/bug.h b/trunk/include/asm-blackfin/bug.h
index 41e53b29f167..6d3e11b1fc57 100644
--- a/trunk/include/asm-blackfin/bug.h
+++ b/trunk/include/asm-blackfin/bug.h
@@ -1,4 +1,17 @@
 #ifndef _BLACKFIN_BUG_H
 #define _BLACKFIN_BUG_H
+
+#ifdef CONFIG_BUG
+#define HAVE_ARCH_BUG
+
+#define BUG() do { \
+	dump_bfin_trace_buffer(); \
+	printk(KERN_EMERG "BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
+	panic("BUG!"); \
+} while (0)
+
+#endif
+
 #include <asm-generic/bug.h>
+
 #endif