diff options
author | Behan Webster <behanw@converseincode.com> | 2014-08-27 00:29:32 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2014-09-08 09:39:19 -0400 |
commit | 2128df143d840a20e12818290eb6e40b95cc4ac0 (patch) | |
tree | a77a57b12cb6ead88811e9125621c34114945a4d /arch/arm64/kernel | |
parent | 786248705ecf5290f26534e8eef62ba6dd63b806 (diff) |
arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c
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>
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
Reviewed-by: Olof Johansson <olof@lixom.net>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r-- | arch/arm64/kernel/traps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 02cd3f023e9a..de1b085e7963 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c | |||
@@ -132,7 +132,6 @@ static void dump_instr(const char *lvl, struct pt_regs *regs) | |||
132 | static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) | 132 | static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) |
133 | { | 133 | { |
134 | struct stackframe frame; | 134 | struct stackframe frame; |
135 | const register unsigned long current_sp asm ("sp"); | ||
136 | 135 | ||
137 | pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk); | 136 | pr_debug("%s(regs = %p tsk = %p)\n", __func__, regs, tsk); |
138 | 137 | ||
@@ -145,7 +144,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) | |||
145 | frame.pc = regs->pc; | 144 | frame.pc = regs->pc; |
146 | } else if (tsk == current) { | 145 | } else if (tsk == current) { |
147 | frame.fp = (unsigned long)__builtin_frame_address(0); | 146 | frame.fp = (unsigned long)__builtin_frame_address(0); |
148 | frame.sp = current_sp; | 147 | frame.sp = current_stack_pointer; |
149 | frame.pc = (unsigned long)dump_backtrace; | 148 | frame.pc = (unsigned long)dump_backtrace; |
150 | } else { | 149 | } else { |
151 | /* | 150 | /* |