From: David Howells <dhowells@redhat.com>
Date: Wed, 15 Apr 2009 18:34:56 +0000 (+0100)
Subject: The default CONFIG_BUG=n version of BUG() should have an empty do...while
X-Git-Tag: v2.6.30-rc3~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da60682c116855cf342926b4f3427079400ee7e6;p=thirdparty%2Fkernel%2Flinux.git

The default CONFIG_BUG=n version of BUG() should have an empty do...while

The default CONFIG_BUG=n version of BUG() should incorporate an empty a
do...while statement to avoid compilation weirdness.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 37b82cb96c891..e727fe0d14510 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -88,7 +88,7 @@ extern void warn_slowpath(const char *file, const int line,
 
 #else /* !CONFIG_BUG */
 #ifndef HAVE_ARCH_BUG
-#define BUG()
+#define BUG() do {} while(0)
 #endif
 
 #ifndef HAVE_ARCH_BUG_ON