ARM: 8171/1: Use current_stack_pointer for return_address

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>
This commit is contained in:
Behan Webster 2014-09-27 00:31:07 +01:00 коммит произвёл Russell King
Родитель 0abc08baf2
Коммит a556ee1247
1 изменённых файлов: 1 добавлений и 2 удалений

Просмотреть файл

@ -39,13 +39,12 @@ void *return_address(unsigned int level)
{ {
struct return_address_data data; struct return_address_data data;
struct stackframe frame; struct stackframe frame;
register unsigned long current_sp asm ("sp");
data.level = level + 2; data.level = level + 2;
data.addr = NULL; data.addr = NULL;
frame.fp = (unsigned long)__builtin_frame_address(0); frame.fp = (unsigned long)__builtin_frame_address(0);
frame.sp = current_sp; frame.sp = current_stack_pointer;
frame.lr = (unsigned long)__builtin_return_address(0); frame.lr = (unsigned long)__builtin_return_address(0);
frame.pc = (unsigned long)return_address; frame.pc = (unsigned long)return_address;