提交 fd722f25 编写于 作者: G Geert Uytterhoeven 提交者: Rich Felker

Revert "sh: add loglvl to printk_address()"

This reverts commit 2deebe4d.

printk_address() is always used as a continuation of the previous
logging, hence it should not include a log level.
Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: NRich Felker <dalias@libc.org>
上级 845d9156
...@@ -12,8 +12,7 @@ enum die_val { ...@@ -12,8 +12,7 @@ enum die_val {
}; };
/* arch/sh/kernel/dumpstack.c */ /* arch/sh/kernel/dumpstack.c */
extern void printk_address(unsigned long address, int reliable, extern void printk_address(unsigned long address, int reliable);
const char *loglvl);
extern void dump_mem(const char *str, const char *loglvl, extern void dump_mem(const char *str, const char *loglvl,
unsigned long bottom, unsigned long top); unsigned long bottom, unsigned long top);
......
...@@ -44,9 +44,9 @@ void dump_mem(const char *str, const char *loglvl, ...@@ -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); reliable ? "" : "? ", (void *) address);
} }
...@@ -118,7 +118,7 @@ static int print_trace_stack(void *data, char *name) ...@@ -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) 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 = { static const struct stacktrace_ops print_trace_ops = {
......
...@@ -213,7 +213,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long address) ...@@ -213,7 +213,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long address)
: "paging request", : "paging request",
address); address);
pr_alert("PC:"); pr_alert("PC:");
printk_address(regs->pc, 1, KERN_ALERT); printk_address(regs->pc, 1);
show_pte(NULL, address); show_pte(NULL, address);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册