Skip to content

Commit fd722f2

Browse files
geertuRich Felker
authored andcommitted
Revert "sh: add loglvl to printk_address()"
This reverts commit 2deebe4. 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 <[email protected]> Signed-off-by: Rich Felker <[email protected]>
1 parent 845d915 commit fd722f2

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

arch/sh/include/asm/kdebug.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ enum die_val {
1212
};
1313

1414
/* 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);
1716
extern void dump_mem(const char *str, const char *loglvl,
1817
unsigned long bottom, unsigned long top);
1918

arch/sh/kernel/dumpstack.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ void dump_mem(const char *str, const char *loglvl,
4444
}
4545
}
4646

47-
void printk_address(unsigned long address, int reliable, const char *loglvl)
47+
void printk_address(unsigned long address, int reliable)
4848
{
49-
printk("%s [<%p>] %s%pS\n", loglvl, (void *) address,
49+
printk(" [<%p>] %s%pS\n", (void *) address,
5050
reliable ? "" : "? ", (void *) address);
5151
}
5252

@@ -118,7 +118,7 @@ static int print_trace_stack(void *data, char *name)
118118
*/
119119
static void print_trace_address(void *data, unsigned long addr, int reliable)
120120
{
121-
printk_address(addr, reliable, (char *)data);
121+
printk_address(addr, reliable);
122122
}
123123

124124
static const struct stacktrace_ops print_trace_ops = {

arch/sh/mm/fault.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long address)
213213
: "paging request",
214214
address);
215215
pr_alert("PC:");
216-
printk_address(regs->pc, 1, KERN_ALERT);
216+
printk_address(regs->pc, 1);
217217

218218
show_pte(NULL, address);
219219
}

0 commit comments

Comments
 (0)