korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "sh: add loglvl to printk_address()"

Browse Source 
This reverts commit 2deebe4d56.

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>
This commit is contained in:
Geert Uytterhoeven 2020-06-17 16:36:32 +02:00 committed by Rich Felker
parent 845d9156fe
commit fd722f25a6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sh/include/asm/kdebug.h
View File

@ -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);

6
arch/sh/kernel/dumpstack.c
View File

@ -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 = {

2
arch/sh/mm/fault.c
View File

@ -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);
}