diff options
| author |   Maxime Ripard <maxime@cerno.tech> | 2020-04-14 09:19:50 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2020-04-14 09:19:50 +0200 |
| commit | a4721ced760684d1776bf31f7925aa41bb3f4846 (patch) | |
| tree | a76e23b60ecceed68b5fa4904f677fe20e304b6e /arch/powerpc/kernel/stacktrace.c | |
| parent | drm/bridge: analogix_dp: Split bind() into probe() and real bind() (diff) | |
| parent | Linux 5.7-rc1 (diff) | |
Merge v5.7-rc1 into drm-misc-fixes
Start the new drm-misc-fixes cycle.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'arch/powerpc/kernel/stacktrace.c')
| -rw-r--r-- | arch/powerpc/kernel/stacktrace.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c index e2a46cfed5fd..c477b8585a29 100644 --- a/arch/powerpc/kernel/stacktrace.c +++ b/arch/powerpc/kernel/stacktrace.c @@ -57,7 +57,7 @@ void save_stack_trace(struct stack_trace *trace) { unsigned long sp; - sp = current_stack_pointer(); + sp = current_stack_frame(); save_context_stack(trace, sp, current, 1); } @@ -71,7 +71,7 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) return; if (tsk == current) - sp = current_stack_pointer(); + sp = current_stack_frame(); else sp = tsk->thread.ksp; @@ -131,7 +131,7 @@ static int __save_stack_trace_tsk_reliable(struct task_struct *tsk, } if (tsk == current) - sp = current_stack_pointer(); + sp = current_stack_frame(); else sp = tsk->thread.ksp; |