Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "sh: add loglvl to printk_address()"

This reverts commit 2deebe4d56d638269a4a728086d64de5734b460a.

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>

authored by

Geert Uytterhoeven and committed by
Rich Felker
fd722f25 845d9156

+5 -6
+1 -2
arch/sh/include/asm/kdebug.h
··· 12 12 }; 13 13 14 14 /* arch/sh/kernel/dumpstack.c */ 15 - extern void printk_address(unsigned long address, int reliable, 16 - const char *loglvl); 15 + extern void printk_address(unsigned long address, int reliable); 17 16 extern void dump_mem(const char *str, const char *loglvl, 18 17 unsigned long bottom, unsigned long top); 19 18
+3 -3
arch/sh/kernel/dumpstack.c
··· 44 44 } 45 45 } 46 46 47 - void printk_address(unsigned long address, int reliable, const char *loglvl) 47 + void printk_address(unsigned long address, int reliable) 48 48 { 49 - printk("%s [<%p>] %s%pS\n", loglvl, (void *) address, 49 + printk(" [<%p>] %s%pS\n", (void *) address, 50 50 reliable ? "" : "? ", (void *) address); 51 51 } 52 52 ··· 118 118 */ 119 119 static void print_trace_address(void *data, unsigned long addr, int reliable) 120 120 { 121 - printk_address(addr, reliable, (char *)data); 121 + printk_address(addr, reliable); 122 122 } 123 123 124 124 static const struct stacktrace_ops print_trace_ops = {
+1 -1
arch/sh/mm/fault.c
··· 213 213 : "paging request", 214 214 address); 215 215 pr_alert("PC:"); 216 - printk_address(regs->pc, 1, KERN_ALERT); 216 + printk_address(regs->pc, 1); 217 217 218 218 show_pte(NULL, address); 219 219 }