diff options
author | Behan Webster <behanw@converseincode.com> | 2014-09-26 19:31:10 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-11-13 18:58:09 -0500 |
commit | 0bf4954f248c59705470bae2210f67a4b03f8f3c (patch) | |
tree | c401585f6c29e73b63254041ad89cb9fded38ca0 | |
parent | 0ebc1f5671dff84b7ba4dcc38ebce956e6dea5fa (diff) |
ARM: 8176/1: Use current_stack_pointer in unwind_backtrace
Use the global current_stack_pointer to get the value of the stack pointer.
This change supports being able to compile the kernel with both gcc and clang.
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Reviewed-by: Jan-Simon Möller <dl9pf@gmx.de>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/kernel/unwind.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c index cbb85c5fabf9..0bee233fef9a 100644 --- a/arch/arm/kernel/unwind.c +++ b/arch/arm/kernel/unwind.c | |||
@@ -471,7 +471,6 @@ int unwind_frame(struct stackframe *frame) | |||
471 | void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk) | 471 | void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk) |
472 | { | 472 | { |
473 | struct stackframe frame; | 473 | struct stackframe frame; |
474 | register unsigned long current_sp asm ("sp"); | ||
475 | 474 | ||
476 | pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk); | 475 | pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk); |
477 | 476 | ||
@@ -485,7 +484,7 @@ void unwind_backtrace(struct pt_regs *regs, struct task_struct *tsk) | |||
485 | frame.pc = regs->ARM_lr; | 484 | frame.pc = regs->ARM_lr; |
486 | } else if (tsk == current) { | 485 | } else if (tsk == current) { |
487 | frame.fp = (unsigned long)__builtin_frame_address(0); | 486 | frame.fp = (unsigned long)__builtin_frame_address(0); |
488 | frame.sp = current_sp; | 487 | frame.sp = current_stack_pointer; |
489 | frame.lr = (unsigned long)__builtin_return_address(0); | 488 | frame.lr = (unsigned long)__builtin_return_address(0); |
490 | frame.pc = (unsigned long)unwind_backtrace; | 489 | frame.pc = (unsigned long)unwind_backtrace; |
491 | } else { | 490 | } else { |