From ee84dd96550fcd5636a54e3e1c59fedaec9633e5 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed, 13 Jan 2010 20:44:38 +0100
Subject: [PATCH] --- yaml --- r: 179282 b: refs/heads/master c:
 a9df8e325d0de527c2e97297704ebbec48c01cbf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d773c3d62a9e..5d4b3ab51040 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb380aadfe34e8d3ce628cb3e386882351940874
+refs/heads/master: a9df8e325d0de527c2e97297704ebbec48c01cbf
diff --git a/trunk/arch/s390/include/asm/bug.h b/trunk/arch/s390/include/asm/bug.h
index efb74fd5156e..b1066b9fb5f8 100644
--- a/trunk/arch/s390/include/asm/bug.h
+++ b/trunk/arch/s390/include/asm/bug.h
@@ -52,6 +52,10 @@
 	unreachable();					\
 } while (0)
 
+#define __WARN() do {					\
+	__EMIT_BUG(BUGFLAG_WARNING);			\
+} while (0)
+
 #define WARN_ON(x) ({					\
 	int __ret_warn_on = !!(x);			\
 	if (__builtin_constant_p(__ret_warn_on)) {	\