kernel: fix regression in backtrace module info change (#19631)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45665

diff --git a/target/linux/generic/patches-3.18/205-backtrace_module_info.patch b/target/linux/generic/patches-3.18/205-backtrace_module_info.patch
index 594871b715fee89ceae1d6ce8bdb472da5754270..f83b21ebc8ef2138d3d305966ae2b68454dd7e0d 100644 (file)
--- a/target/linux/generic/patches-3.18/205-backtrace_module_info.patch
+++ b/target/linux/generic/patches-3.18/205-backtrace_module_info.patch
@@ -1,38 +1,36 @@
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
-@@ -613,10 +613,12 @@ static noinline_for_stack
- char *symbol_string(char *buf, char *end, void *ptr,
+@@ -614,8 +614,10 @@ char *symbol_string(char *buf, char *end
                    struct printf_spec spec, const char *fmt)
  {
-+#ifndef CONFIG_KALLSYMS
-+      struct module *mod;
-+#endif
        unsigned long value;
 -#ifdef CONFIG_KALLSYMS
        char sym[KSYM_SYMBOL_LEN];
--#endif
++#ifndef CONFIG_KALLSYMS
++      struct module *mod;
 +      int len;
+ #endif
  
        if (fmt[1] == 'R')
-               ptr = __builtin_extract_return_addr(ptr);
-@@ -630,13 +632,15 @@ char *symbol_string(char *buf, char *end
+@@ -629,15 +631,15 @@ char *symbol_string(char *buf, char *end
+               sprint_symbol(sym, value);
        else
                sprint_symbol_no_offset(sym, value);
- 
+-
 -      return string(buf, end, sym, spec);
  #else
 -      spec.field_width = 2 * sizeof(void *);
 -      spec.flags |= SPECIAL | SMALL | ZEROPAD;
 -      spec.base = 16;
 +      len = snprintf(sym, sizeof(sym), "0x%lx", value);
-+
+ 
+-      return number(buf, end, value, spec);
 +      mod = __module_address(value);
 +      if (mod)
 +              snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
 +                       mod->name, mod->module_core, mod->core_size);
- 
--      return number(buf, end, value, spec);
-+      return string(buf, end, sym, spec);
  #endif
++      return string(buf, end, sym, spec);
  }
  
+ static noinline_for_stack

diff --git a/target/linux/generic/patches-4.0/205-backtrace_module_info.patch b/target/linux/generic/patches-4.0/205-backtrace_module_info.patch
index 8417d609d3cb4f7eb7d680a658ab71929bc2700b..2d0cc5ab8b09ef7ec0fc7ab223b201be768a248d 100644 (file)
--- a/target/linux/generic/patches-4.0/205-backtrace_module_info.patch
+++ b/target/linux/generic/patches-4.0/205-backtrace_module_info.patch
@@ -1,38 +1,36 @@
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
-@@ -614,10 +614,12 @@ static noinline_for_stack
- char *symbol_string(char *buf, char *end, void *ptr,
+@@ -615,8 +615,10 @@ char *symbol_string(char *buf, char *end
                    struct printf_spec spec, const char *fmt)
  {
-+#ifndef CONFIG_KALLSYMS
-+      struct module *mod;
-+#endif
        unsigned long value;
 -#ifdef CONFIG_KALLSYMS
        char sym[KSYM_SYMBOL_LEN];
--#endif
++#ifndef CONFIG_KALLSYMS
++      struct module *mod;
 +      int len;
+ #endif
  
        if (fmt[1] == 'R')
-               ptr = __builtin_extract_return_addr(ptr);
-@@ -631,13 +633,15 @@ char *symbol_string(char *buf, char *end
+@@ -630,15 +632,15 @@ char *symbol_string(char *buf, char *end
+               sprint_symbol(sym, value);
        else
                sprint_symbol_no_offset(sym, value);
- 
+-
 -      return string(buf, end, sym, spec);
  #else
 -      spec.field_width = 2 * sizeof(void *);
 -      spec.flags |= SPECIAL | SMALL | ZEROPAD;
 -      spec.base = 16;
 +      len = snprintf(sym, sizeof(sym), "0x%lx", value);
-+
+ 
+-      return number(buf, end, value, spec);
 +      mod = __module_address(value);
 +      if (mod)
 +              snprintf(sym + len, sizeof(sym) - len, " [%s@%p+0x%x]",
 +                       mod->name, mod->module_core, mod->core_size);
- 
--      return number(buf, end, value, spec);
-+      return string(buf, end, sym, spec);
  #endif
++      return string(buf, end, sym, spec);
  }
  
+ static noinline_for_stack