Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9cd0ed9 authored by Will Deacon's avatar Will Deacon
Browse files

arm64: traps: address fallout from printk -> pr_* conversion 



Commit ac7b406c ("arm64: Use pr_* instead of printk") was a fairly
mindless s/printk/pr_*/ change driven by a complaint from checkpatch.

As is usual with such changes, this has led to some odd behaviour on
arm64:

  * syslog now picks up the "pr_emerg" line from dump_backtrace, but not
    the actual trace, which leads to a bunch of "kernel:Call trace:"
    lines in the log

  * __{pte,pmd,pgd}_error print at KERN_CRIT, as opposed to KERN_ERR
    which is used by other architectures.

This patch restores the original printk behaviour for dump_backtrace
and downgrade the pgtable error macros to KERN_ERR.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 20380bb3

arch/arm64/kernel/traps.c

+5 −5
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) 
#endif



	skip = !!regs;

	pr_emerg("Call trace:\n");

	printk("Call trace:\n");

	while (1) {

		unsigned long where = frame.pc;

		unsigned long stack;
@@ -482,22 +482,22 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason, unsigned int esr) 


void __pte_error(const char *file, int line, unsigned long val)

{

	pr_crit("%s:%d: bad pte %016lx.\n", file, line, val);

	pr_err("%s:%d: bad pte %016lx.\n", file, line, val);

}



void __pmd_error(const char *file, int line, unsigned long val)

{

	pr_crit("%s:%d: bad pmd %016lx.\n", file, line, val);

	pr_err("%s:%d: bad pmd %016lx.\n", file, line, val);

}



void __pud_error(const char *file, int line, unsigned long val)

{

	pr_crit("%s:%d: bad pud %016lx.\n", file, line, val);

	pr_err("%s:%d: bad pud %016lx.\n", file, line, val);

}



void __pgd_error(const char *file, int line, unsigned long val)

{

	pr_crit("%s:%d: bad pgd %016lx.\n", file, line, val);

	pr_err("%s:%d: bad pgd %016lx.\n", file, line, val);

}



/* GENERIC_BUG traps */