diff --git a/[refs] b/[refs]
index e4a37ef3a509..d65b8b156a6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 616df135110ccae617ef9f10e0814fa48462cc37
+refs/heads/master: da60682c116855cf342926b4f3427079400ee7e6
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 37b82cb96c89..e727fe0d1451 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/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