From baae95ee536098388e55159f2b7e20086ba8e81b Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Fri, 25 Jul 2008 01:45:56 -0700
Subject: [PATCH] --- yaml --- r: 105820 b: refs/heads/master c:
 2711b793eb62a5873a0ba583a69252040aef176e h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/kallsyms.h | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2c5f6f1862bd..8087d1ba6e56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 924d9addb9b1474fc81a78a5c6706755efea7aaa
+refs/heads/master: 2711b793eb62a5873a0ba583a69252040aef176e
diff --git a/trunk/include/linux/kallsyms.h b/trunk/include/linux/kallsyms.h
index 00c1801099fa..57aefa160a92 100644
--- a/trunk/include/linux/kallsyms.h
+++ b/trunk/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*/