diff options
| author | Petr Mladek <pmladek@suse.com> | 2018-01-22 10:40:32 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2018-01-22 10:40:32 +0100 |
| commit | 3ccdc5190f8df12dfafff9264e406c5496401da5 (patch) | |
| tree | ca4afea86b2ae2625125658b2e0af2e043e84017 /lib/vsprintf.c | |
| parent | 6fd78a1a99c9580da49ee8f951fdce9846256375 (diff) | |
| parent | 1df7338ac96558d5ae4c1a9dd5d1cb60fcd1bdb2 (diff) | |
Merge branch 'for-4.16-deprecate-printk-pf' into for-4.16
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 1746bae94d41..16e2eefb0f79 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -40,7 +40,6 @@ #include "../mm/internal.h" /* For the trace_print_flags arrays */ #include <asm/page.h> /* for PAGE_SIZE */ -#include <asm/sections.h> /* for dereference_function_descriptor() */ #include <asm/byteorder.h> /* cpu_to_le16 */ #include <linux/string_helpers.h> @@ -1723,10 +1722,10 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, switch (*fmt) { case 'F': case 'f': - ptr = dereference_function_descriptor(ptr); - /* Fallthrough */ case 'S': case 's': + ptr = dereference_symbol_descriptor(ptr); + /* Fallthrough */ case 'B': return symbol_string(buf, end, ptr, spec, fmt); case 'R': |