1 files changed, 20 insertions, 15 deletions

diff --git a/kernel/panic.c b/kernel/panic.c
index 874ecf1307ae..984b3ecbd72c 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -340,39 +340,44 @@ void oops_exit(void)
 }
 
 #ifdef WANT_WARN_ON_SLOWPATH
-void warn_slowpath_fmt(const char *file, int line, const char *fmt, ...)
-{
+struct slowpath_args {
+        const char *fmt;
         va_list args;
-        char function[KSYM_SYMBOL_LEN];
-        unsigned long caller = (unsigned long)__builtin_return_address(0);
-        const char *board;
+};
 
-        sprint_symbol(function, caller);
+static void warn_slowpath_common(const char *file, int line, void *caller, struct slowpath_args *args)
+{
+        const char *board;
 
         printk(KERN_WARNING "------------[ cut here ]------------\n");
-        printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,
-                line, function);
+        printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
         board = dmi_get_system_info(DMI_PRODUCT_NAME);
         if (board)
                 printk(KERN_WARNING "Hardware name: %s\n", board);
 
-        if (*fmt) {
-                va_start(args, fmt);
-                vprintk(fmt, args);
-                va_end(args);
-        }
+        if (args)
+                vprintk(args->fmt, args->args);
 
         print_modules();
         dump_stack();
         print_oops_end_marker();
         add_taint(TAINT_WARN);
 }
+
+void warn_slowpath_fmt(const char *file, int line, const char *fmt, ...)
+{
+        struct slowpath_args args;
+
+        args.fmt = fmt;
+        va_start(args.args, fmt);
+        warn_slowpath_common(file, line, __builtin_return_address(0), &args);
+        va_end(args.args);
+}
 EXPORT_SYMBOL(warn_slowpath_fmt);
 
 void warn_slowpath_null(const char *file, int line)
 {
-        static const char *empty = "";
-        warn_slowpath_fmt(file, line, empty);
+        warn_slowpath_common(file, line, __builtin_return_address(0), NULL);
 }
 EXPORT_SYMBOL(warn_slowpath_null);
 #endif