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

Commit c8bee0ad authored by Nikolay Borisov's avatar Nikolay Borisov Committed by Russell King
Browse files

ARM: 8073/1: unwind: Use arm_get_current_stackframe 



Make the unwind code use the correct API so that the frame pointer
is extracted from the correct register.

Signed-off-by: default avatarNikolay Borisov <Nikolay.Borisov@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a3250c92

arch/arm/kernel/unwind.c

+3 −5
Original line number Diff line number Diff line
@@ -479,12 +479,10 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk) 
		tsk = current;



	if (regs) {

		frame.fp = regs->ARM_fp;

		frame.sp = regs->ARM_sp;

		frame.lr = regs->ARM_lr;

		arm_get_current_stackframe(regs, &frame);

		/* PC might be corrupted, use LR in that case. */

		frame.pc = kernel_text_address(regs->ARM_pc)

			 ? regs->ARM_pc : regs->ARM_lr;

		if (!kernel_text_address(regs->ARM_pc))

			frame.pc = regs->ARM_lr;

	} else if (tsk == current) {

		frame.fp = (unsigned long)__builtin_frame_address(0);

		frame.sp = current_sp;