Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek...

[linux-2.6-block.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 8f56cdd52149ba90fb4013a7ebf072a2992a5e05..77ee6ced11b17a411d95f266faeaaf7dba309d4f 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -42,7 +42,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>
@@ -1863,10 +1862,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':