Messages in this thread Patch in this message | | | Date | Fri, 13 Jun 2008 10:57:16 +0200 | Subject | [PATCH] kallsyms: unify 32- and 64-bit code | From | Vegard Nossum <> |
| |
From: Vegard Nossum <vegard.nossum@gmail.com> Date: Fri, 13 Jun 2008 10:02:26 +0200 Subject: [PATCH] kallsyms: unify 32- and 64-bit code
Use the %p format string which already accounts for the padding you need with a pointer type on a particular architecture.
Also replace the macro with a static inline function to match the rest of the file.
Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com> --- include/linux/kallsyms.h | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h index 00c1801..57aefa1 100644 --- a/include/linux/kallsyms.h +++ b/include/linux/kallsyms.h @@ -6,6 +6,7 @@ #define _LINUX_KALLSYMS_H #include <linux/errno.h> +#include <linux/kernel.h> #include <linux/stddef.h> #define KSYM_NAME_LEN 128 @@ -105,18 +106,10 @@ static inline void print_fn_descriptor_symbol(const char *fmt, void *addr) print_symbol(fmt, (unsigned long)addr); } -#ifndef CONFIG_64BIT -#define print_ip_sym(ip) \ -do { \ - printk("[<%08lx>]", ip); \ - print_symbol(" %s\n", ip); \ -} while(0) -#else -#define print_ip_sym(ip) \ -do { \ - printk("[<%016lx>]", ip); \ - print_symbol(" %s\n", ip); \ -} while(0) -#endif +static inline void print_ip_sym(unsigned long ip) +{ + printk("[<%p>]", (void *) ip); + print_symbol(" %s\n", ip); +} #endif /*_LINUX_KALLSYMS_H*/ -- 1.5.4.1
| |