From 03562a9129b5aea2829cad136fa010b46f059e7f Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 27 Apr 2009 11:55:23 +0100
Subject: [PATCH] --- yaml --- r: 144194 b: refs/heads/master c:
 9a523d427dc5908a79ce3ff742e9606e852802d6 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/frv/include/asm/bug.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 32f487969214..001e81f68bda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e37469f68a15feb40ee9f6325d1e1793f90afe39
+refs/heads/master: 9a523d427dc5908a79ce3ff742e9606e852802d6
diff --git a/trunk/arch/frv/include/asm/bug.h b/trunk/arch/frv/include/asm/bug.h
index 6b1b44d71028..2e054508a2f6 100644
--- a/trunk/arch/frv/include/asm/bug.h
+++ b/trunk/arch/frv/include/asm/bug.h
@@ -30,7 +30,7 @@ extern void __debug_bug_printk(const char *file, unsigned line);
 do {						\
 	__debug_bug_trap(signr);		\
 	asm volatile("nop");			\
-} while(0)
+} while(1)
 
 #define HAVE_ARCH_BUG
 #define BUG()					\
@@ -46,7 +46,8 @@ do {						\
 #define HAVE_ARCH_KGDB_BAD_PAGE
 #define kgdb_bad_page(page) do { kgdb_raise(SIGABRT); } while(0)
 #endif
-#endif
+
+#endif /* CONFIG_BUG */
 
 #include <asm-generic/bug.h>