sparc: Use new '%pS' infrastructure to print symbols.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 10 deletions

diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index e18a5da025d3..4bb430940a61 100644
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -1,6 +1,6 @@
 /*  linux/arch/sparc/kernel/process.c
  *
- *  Copyright (C) 1995 David S. Miller (davem@davemloft.net)
+ *  Copyright (C) 1995, 2008 David S. Miller (davem@davemloft.net)
  *  Copyright (C) 1996 Eddie C. Dost   (ecd@skynet.be)
  */
 
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
-#include <linux/kallsyms.h>
 #include <linux/mm.h>
 #include <linux/stddef.h>
 #include <linux/ptrace.h>
@@ -198,7 +197,7 @@ void __show_backtrace(unsigned long fp)
                        rw->ins[4], rw->ins[5],
                        rw->ins[6],
                        rw->ins[7]);
-                print_symbol("%s\n", rw->ins[7]);
+                printk("%pS\n", (void *) rw->ins[7]);
                 rw = (struct reg_window *) rw->ins[6];
         }
         spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
@@ -265,14 +264,14 @@ void show_regs(struct pt_regs *r)
 
         printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx    %s\n",
                r->psr, r->pc, r->npc, r->y, print_tainted());
-        print_symbol("PC: <%s>\n", r->pc);
+        printk("PC: <%pS>\n", (void *) r->pc);
         printk("%%G: %08lx %08lx  %08lx %08lx  %08lx %08lx  %08lx %08lx\n",
                r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
                r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
         printk("%%O: %08lx %08lx  %08lx %08lx  %08lx %08lx  %08lx %08lx\n",
                r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
                r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
-        print_symbol("RPC: <%s>\n", r->u_regs[15]);
+        printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
 
         printk("%%L: %08lx %08lx  %08lx %08lx  %08lx %08lx  %08lx %08lx\n",
                rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
@@ -307,7 +306,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
                 rw = (struct reg_window *) fp;
                 pc = rw->ins[7];
                 printk("[%08lx : ", pc);
-                print_symbol("%s ] ", pc);
+                printk("%pS ] ", (void *) pc);
                 fp = rw->ins[6];
         } while (++count < 16);
         printk("\n");
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c
index ac8ee6ab1337..5d45d5fd8c99 100644
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
@@ -1,7 +1,7 @@
 /*
  * arch/sparc/kernel/traps.c
  *
- * Copyright 1995 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright 1995, 2008 David S. Miller (davem@davemloft.net)
  * Copyright 2000 Jakub Jelinek (jakub@redhat.com)
  */
 
@@ -11,7 +11,6 @@
 
 #include <linux/sched.h>  /* for jiffies */
 #include <linux/kernel.h>
-#include <linux/kallsyms.h>
 #include <linux/signal.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
@@ -116,8 +115,8 @@ void die_if_kernel(char *str, struct pt_regs *regs)
                       count++ < 30                              &&
                       (((unsigned long) rw) >= PAGE_OFFSET)     &&
                       !(((unsigned long) rw) & 0x7)) {
-                        printk("Caller[%08lx]", rw->ins[7]);
-                        print_symbol(": %s\n", rw->ins[7]);
+                        printk("Caller[%08lx]: %pS\n", rw->ins[7],
+                               (void *) rw->ins[7]);
                         rw = (struct reg_window *)rw->ins[6];
                 }
         }