From f0fec31aa25c8a116f7cae51a8b36f2ffcfb410b Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 15 Apr 2009 19:34:51 +0100
Subject: [PATCH] --- yaml --- r: 143402 b: refs/heads/master c:
 616df135110ccae617ef9f10e0814fa48462cc37 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/arch/mn10300/include/asm/bug.h | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2b7f408d60a6..e4a37ef3a509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d320a5072f93abb913e9b9d84304f819c34b96
+refs/heads/master: 616df135110ccae617ef9f10e0814fa48462cc37
diff --git a/trunk/arch/mn10300/include/asm/bug.h b/trunk/arch/mn10300/include/asm/bug.h
index 4fcf3384e259..aa6a38886391 100644
--- a/trunk/arch/mn10300/include/asm/bug.h
+++ b/trunk/arch/mn10300/include/asm/bug.h
@@ -11,10 +11,12 @@
 #ifndef _ASM_BUG_H
 #define _ASM_BUG_H
 
+#ifdef CONFIG_BUG
+
 /*
  * Tell the user there is some problem.
  */
-#define _debug_bug_trap()					\
+#define BUG()							\
 do {								\
 	asm volatile(						\
 		"	syscall 15			\n"	\
@@ -25,11 +27,11 @@ do {								\
 		:						\
 		: "i"(__FILE__), "i"(__LINE__)			\
 		);						\
-} while (0)
-
-#define BUG() _debug_bug_trap()
+} while (1)
 
 #define HAVE_ARCH_BUG
+#endif /* CONFIG_BUG */
+
 #include <asm-generic/bug.h>
 
 #endif /* _ASM_BUG_H */