1 files changed, 11 insertions, 6 deletions

diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index d56fedbb457a..2632328d8646 100644
--- a/include/asm-generic/bug.h
+++ b/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
+#ifndef __ASSEMBLY__
+extern void warn_on_slowpath(const char *file, const int line);
+#define WANT_WARN_ON_SLOWPATH
+#endif
+#define __WARN() warn_on_slowpath(__FILE__, __LINE__)
+#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