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

Commit c07ab957 authored by Kefeng Wang's avatar Kefeng Wang Committed by Will Deacon
Browse files

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: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 48f99c8e

arch/arm64/kernel/probes/kprobes.c

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

arch/arm64/mm/fault.c

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