Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 19 insertions, 4 deletions

diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
index 54e2549f96ba..849043ce4ed6 100644
--- a/include/linux/kallsyms.h
+++ b/include/linux/kallsyms.h
@@ -57,10 +57,25 @@ 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);              \
+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));
+}
+
+#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*/