From 8161e9ba83cf384c293ebf7ad130ae8d011463da Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Fri, 5 Nov 2010 16:12:34 -0700
Subject: [PATCH] --- yaml --- r: 221881 b: refs/heads/master c:
 69448c2a4d23e5883cbca21a173e3eb89f095746 h: refs/heads/master i:   221879:
 a384c626c2739d33fdd2eda708e40317d45d32ab v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/kernel/traps.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 02152b9c8d83..c1fccddf0309 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 235584b6f3b71bc1381be13a963a16f7107650cf
+refs/heads/master: 69448c2a4d23e5883cbca21a173e3eb89f095746
diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c
index cda78d59aa31..446aee97436f 100644
--- a/trunk/arch/arm/kernel/traps.c
+++ b/trunk/arch/arm/kernel/traps.c
@@ -53,10 +53,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
 {
 #ifdef CONFIG_KALLSYMS
-	char sym1[KSYM_SYMBOL_LEN], sym2[KSYM_SYMBOL_LEN];
-	sprint_symbol(sym1, where);
-	sprint_symbol(sym2, from);
-	printk("[<%08lx>] (%s) from [<%08lx>] (%s)\n", where, sym1, from, sym2);
+	printk("[<%08lx>] (%pS) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
 #else
 	printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
 #endif