arm64: Call __show_regs directly

Generic code expects show_regs() to also dump the stack, but arm64's
show_reg() does not do this. Some arm64 callers of show_regs() *only*
want the registers dumped, without the stack.

To enable generic code to work as expected, we need to make
show_regs() dump the stack. Where we only want the registers dumped,
we must use __show_regs().

This patch updates code to use __show_regs() where only registers are
desired. A subsequent patch will modify show_regs().

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c
index c5c45942fb6e6693c5f8c195bb6596e2fa9f6ff2..d849d9804011df6eabb143ed68da8d260dd5074d 100644 (file)
--- a/arch/arm64/kernel/probes/kprobes.c
+++ b/arch/arm64/kernel/probes/kprobes.c
@@ -522,9 +522,9 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
                pr_err("current sp %lx does not match saved sp %lx\n",
                       orig_sp, stack_addr);
                pr_err("Saved registers for jprobe %p\n", jp);
-               show_regs(saved_regs);
+               __show_regs(saved_regs);
                pr_err("Current registers\n");
-               show_regs(regs);
+               __show_regs(regs);
                BUG();
        }
        unpause_graph_tracing();

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 37b95dff0b07f4eb0967c4a9b27318c6d81daa8c..c3f2b1048f83b9c4764b9673434ea3ba4eea3bae 100644 (file)
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -250,7 +250,7 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr,
                        tsk->comm, task_pid_nr(tsk), inf->name, sig,
                        addr, esr);
                show_pte(tsk->mm, addr);
-               show_regs(regs);
+               __show_regs(regs);
        }
 
        tsk->thread.fault_address = addr;