diff --git a/[refs] b/[refs]
index 4c2429f6c144..ccd19e9dcd17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edd5378740fe7717b1377ee04e593cfad8d29650
+refs/heads/master: 2d6cd2a5908adecd06c8cee2a73814463ed71493
diff --git a/trunk/arch/s390/include/asm/bug.h b/trunk/arch/s390/include/asm/bug.h
index 384e3621e341..7efd0abe8887 100644
--- a/trunk/arch/s390/include/asm/bug.h
+++ b/trunk/arch/s390/include/asm/bug.h
@@ -47,7 +47,10 @@
 
 #endif /* CONFIG_DEBUG_BUGVERBOSE */
 
-#define BUG()	__EMIT_BUG(0)
+#define BUG() do {					\
+	__EMIT_BUG(0);					\
+	for (;;);					\
+} while (0)
 
 #define WARN_ON(x) ({					\
 	int __ret_warn_on = !!(x);			\