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