diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-16 09:34:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-16 09:34:23 +0200 |
| commit | e3bbaa3cb6ac5a245e5ecc28b09f9b7b93b2dd8a (patch) | |
| tree | 04285bbf8d497caf6c2205dcf39e46873828cddc /lib | |
| parent | 9c3254ad42e7925c3a3907a072185273705bd7b2 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/memory-corruption-check
Diffstat (limited to 'lib')
| -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 d8d1d1142248..c399bc1093cb 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; |