From e39b01b0fc0cc6ccbb9a2251d9934607a882cf65 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Wed, 30 Jan 2008 13:32:50 +0100
Subject: [PATCH] --- yaml --- r: 80188 b: refs/heads/master c:
 3a6a62f96f168d192fb0cc9c0b5ee2584740b32d h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-generic/bug.h | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 340b20167ed6..ca33fbb508d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f315decbd05fefbca09bd492ae54eaa334ba826b
+refs/heads/master: 3a6a62f96f168d192fb0cc9c0b5ee2584740b32d
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index d56fedbb457a..1a0e1a7684bd 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/include/asm-generic/bug.h
@@ -31,14 +31,19 @@ struct bug_entry {
 #define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while(0)
 #endif
 
-#ifndef HAVE_ARCH_WARN_ON
+#ifndef __WARN
+#define __WARN() do {							\
+	printk("WARNING: at %s:%d %s()\n", __FILE__,			\
+		__LINE__, __FUNCTION__);				\
+	dump_stack();							\
+} while (0)
+#endif
+
+#ifndef WARN_ON
 #define WARN_ON(condition) ({						\
 	int __ret_warn_on = !!(condition);				\
-	if (unlikely(__ret_warn_on)) {					\
-		printk("WARNING: at %s:%d %s()\n", __FILE__,		\
-			__LINE__, __FUNCTION__);			\
-		dump_stack();						\
-	}								\
+	if (unlikely(__ret_warn_on))					\
+		__WARN();						\
 	unlikely(__ret_warn_on);					\
 })
 #endif