diff --git a/[refs] b/[refs] index f3967a70541a..b4ced9d5070a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d435f9d8ff01ae726a2a84edb9c2457787a337e +refs/heads/master: 8d8fdf5c76816e5263073008f03f097ffc713db3 diff --git a/trunk/include/linux/kallsyms.h b/trunk/include/linux/kallsyms.h index ad71ac053d6e..849043ce4ed6 100644 --- a/trunk/include/linux/kallsyms.h +++ b/trunk/include/linux/kallsyms.h @@ -64,4 +64,18 @@ static inline void print_symbol(const char *fmt, unsigned long addr) __builtin_extract_return_addr((void *)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 + #endif /*_LINUX_KALLSYMS_H*/