Commit fd722f25 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Rich Felker
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent 845d9156

arch/sh/include/asm/kdebug.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

arch/sh/kernel/dumpstack.c

+3 −3
Original line number Diff line number Diff line
@@ -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 = {

arch/sh/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE