Revert "sh: add loglvl to printk_address()"

This reverts commit 33bd99ed7549581942f1e30e1f4f1a957c16ad0f.

printk_address() is always used as a continuation of the previous
logging, hence it should not include a log level.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rich Felker <dalias@libc.org>

diff --git a/arch/sh/include/asm/kdebug.h b/arch/sh/include/asm/kdebug.h
index 960545306afa4d9352139bedcbc26319717b2bd5..de8693fabb1d95b563dcde35ef43d7f0487c2261 100644 (file)
--- a/arch/sh/include/asm/kdebug.h
+++ b/arch/sh/include/asm/kdebug.h
@@ -12,8 +12,7 @@ enum die_val {
 };
 
 /* arch/sh/kernel/dumpstack.c */
-extern void printk_address(unsigned long address, int reliable,
-                          const char *loglvl);
+extern void printk_address(unsigned long address, int reliable);
 extern void dump_mem(const char *str, const char *loglvl,
                     unsigned long bottom, unsigned long top);
 

diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c
index a13c045804ed1027fcef019060885ca594233127..ad548fc976350c50f0eba169f6279af0ff0e11d9 100644 (file)
--- a/arch/sh/kernel/dumpstack.c
+++ b/arch/sh/kernel/dumpstack.c
@@ -44,9 +44,9 @@ void dump_mem(const char *str, const char *loglvl,
        }
 }
 
-void printk_address(unsigned long address, int reliable, const char *loglvl)
+void printk_address(unsigned long address, int reliable)
 {
-       printk("%s [<%p>] %s%pS\n", loglvl, (void *) address,
+       printk(" [<%p>] %s%pS\n", (void *) address,
                        reliable ? "" : "? ", (void *) address);
 }
 
@@ -118,7 +118,7 @@ static int print_trace_stack(void *data, char *name)
  */
 static void print_trace_address(void *data, unsigned long addr, int reliable)
 {
-       printk_address(addr, reliable, (char *)data);
+       printk_address(addr, reliable);
 }
 
 static const struct stacktrace_ops print_trace_ops = {

diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index acd1c7599498382563b1f5ef24e5a3d0c09a48f8..92b1ce105f4b6c6f819de8e835456faf14fdf9cb 100644 (file)
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -213,7 +213,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long address)
                                     : "paging request",
                 address);
        pr_alert("PC:");
-       printk_address(regs->pc, 1, KERN_ALERT);
+       printk_address(regs->pc, 1);
 
        show_pte(NULL, address);
 }