path: root/lib
diff options
authorJames Bottomley <>2008-09-03 20:43:36 -0500
committerLinus Torvalds <>2008-09-09 11:51:15 -0700
commitdeac93df26b20cf8438339b5935b5f5643bc30c9 (patch)
tree8e67edd505e4a8bde380c724b67ce9ca98b8ee91 /lib
parent7ae115b4f50d3c5824f1a15e572b5de9d1b06d35 (diff)
lib: Correct printk %pF to work on all architectures
It was introduced by "vsprintf: add support for '%pS' and '%pF' pointer formats" in commit 0fe1ef24f7bd0020f29ffe287dfdb9ead33ca0b2. However, the current way its coded doesn't work on parisc64. For two reasons: 1) parisc isn't in the #ifdef and 2) parisc has a different format for function descriptors Make dereference_function_descriptor() more accommodating by allowing architecture overrides. I put the three overrides (for parisc64, ppc64 and ia64) in arch/kernel/module.c because that's where the kernel internal linker which knows how to deal with function descriptors sits. Signed-off-by: James Bottomley <> Acked-by: Benjamin Herrenschmidt <> Acked-by: Tony Luck <> Acked-by: Kyle McMartin <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'lib')
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index d8d1d114224..c399bc1093c 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -27,6 +27,7 @@
#include <asm/page.h> /* for PAGE_SIZE */
#include <asm/div64.h>
+#include <asm/sections.h> /* for dereference_function_descriptor() */
/* Works only for digits and letters, but small and fast */
#define TOLOWER(x) ((x) | 0x20)
@@ -513,16 +514,6 @@ static char *string(char *buf, char *end, char *s, int field_width, int precisio
return buf;
-static inline void *dereference_function_descriptor(void *ptr)
-#if defined(CONFIG_IA64) || defined(CONFIG_PPC64)
- void *p;
- if (!probe_kernel_address(ptr, p))
- ptr = p;
- return ptr;
static char *symbol_string(char *buf, char *end, void *ptr, int field_width, int precision, int flags)
unsigned long value = (unsigned long) ptr;