From a8bb396162e4f81872753d4c8c9af8435b04a7bc Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Mon, 20 Oct 2008 14:41:03 -0700
Subject: [PATCH] --- yaml --- r: 116755 b: refs/heads/master c:
 f6f286f33e843862c559bfea9281318c4cdec6b0 h: refs/heads/master i:   116753:
 f3b25a71673f0f2c0824ae76ae71cdc368bd3268   116751:
 bd933ab34d957ba44ff57b76f938372b8aa1f145 v: v3

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

diff --git a/[refs] b/[refs]
index b3f6b0aed78d..cde3c505e1c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f41b8cdc6ef33b3432cee36264d628a80398362
+refs/heads/master: f6f286f33e843862c559bfea9281318c4cdec6b0
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 0f6dabd4b517..12c07c1866b2 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/include/asm-generic/bug.h
@@ -41,7 +41,7 @@ extern void warn_slowpath(const char *file, const int line,
 #define __WARN() warn_on_slowpath(__FILE__, __LINE__)
 #define __WARN_printf(arg...) warn_slowpath(__FILE__, __LINE__, arg)
 #else
-#define __WARN_printf(arg...) __WARN()
+#define __WARN_printf(arg...) do { printk(arg); __WARN(); } while (0)
 #endif
 
 #ifndef WARN_ON