From 9de7c4ef5910c68c6fe23a0f7cc6fe42b52fda00 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Thu, 25 Dec 2008 13:39:17 +0100
Subject: [PATCH] --- yaml --- r: 121399 b: refs/heads/master c:
 2d6cd2a5908adecd06c8cee2a73814463ed71493 h: refs/heads/master i:   121397:
 5ce16065f51061bc6b241a2142ca41d6db2060f7   121395:
 8010b9dc74aae67d9f26bc0a4c4e60d14de6d9fc   121391:
 a612cf7d815999b2c852c9974242992231acb367 v: v3

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

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);			\