diff --git a/[refs] b/[refs] index 66a8f0f9513b..88b8c36ab755 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dada0769b95602ae791b9c4cd1cbecfc367f00a9 +refs/heads/master: b02454f43578b24bc8b8ab54a239156841f56f6d diff --git a/trunk/include/linux/kallsyms.h b/trunk/include/linux/kallsyms.h index 54e2549f96ba..ad71ac053d6e 100644 --- a/trunk/include/linux/kallsyms.h +++ b/trunk/include/linux/kallsyms.h @@ -57,10 +57,11 @@ do { \ #define print_fn_descriptor_symbol(fmt, addr) print_symbol(fmt, addr) #endif -#define print_symbol(fmt, addr) \ -do { \ - __check_printsym_format(fmt, ""); \ - __print_symbol(fmt, addr); \ -} while(0) +static inline void print_symbol(const char *fmt, unsigned long addr) +{ + __check_printsym_format(fmt, ""); + __print_symbol(fmt, (unsigned long) + __builtin_extract_return_addr((void *)addr)); +} #endif /*_LINUX_KALLSYMS_H*/