diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:37:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 13:37:28 +0200 |
| commit | 09b22a2f678ae733801b888c44756d0abd686b8a (patch) | |
| tree | 6ca52d4011ce6b11c6450d3a574ea6a53cc0d339 /lib/vsprintf.c | |
| parent | 3ba35573ad9a149a3af19625b502679283382f6b (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | kernel-crypto-09b22a2f678ae733801b888c44756d0abd686b8a.tar.gz kernel-crypto-09b22a2f678ae733801b888c44756d0abd686b8a.tar.xz kernel-crypto-09b22a2f678ae733801b888c44756d0abd686b8a.zip | |
Merge commit 'v2.6.27-rc6' into sched/devel
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 11 |
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; -#endif - 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; |