diff options
| author | Olof Johansson <olof@lixom.net> | 2018-09-25 11:30:47 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-09-25 11:30:47 -0700 |
| commit | cdddeefc39cc26b2d429f8f7ea3c35bf8cb8c6a1 (patch) | |
| tree | 2628d4922d0675df5659439f22f5ebda9c4b302a /arch/nds32/kernel/stacktrace.c | |
| parent | bf1da406909b13903873d1f91346f99303fd8cb3 (diff) | |
| parent | 11da3a7f84f19c26da6f86af878298694ede0804 (diff) | |
Merge tag 'v4.19-rc3' into next/drivers
Linux 4.19-rc3
Diffstat (limited to 'arch/nds32/kernel/stacktrace.c')
| -rw-r--r-- | arch/nds32/kernel/stacktrace.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/nds32/kernel/stacktrace.c b/arch/nds32/kernel/stacktrace.c index 8b231e910ea6..d974c0c1c65f 100644 --- a/arch/nds32/kernel/stacktrace.c +++ b/arch/nds32/kernel/stacktrace.c @@ -4,6 +4,7 @@ #include <linux/sched/debug.h> #include <linux/sched/task_stack.h> #include <linux/stacktrace.h> +#include <linux/ftrace.h> void save_stack_trace(struct stack_trace *trace) { @@ -16,6 +17,7 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) unsigned long *fpn; int skip = trace->skip; int savesched; + int graph_idx = 0; if (tsk == current) { __asm__ __volatile__("\tori\t%0, $fp, #0\n":"=r"(fpn)); @@ -29,10 +31,12 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) && (fpn >= (unsigned long *)TASK_SIZE)) { unsigned long lpp, fpp; - lpp = fpn[-1]; + lpp = fpn[LP_OFFSET]; fpp = fpn[FP_OFFSET]; if (!__kernel_text_address(lpp)) break; + else + lpp = ftrace_graph_ret_addr(tsk, &graph_idx, lpp, NULL); if (savesched || !in_sched_functions(lpp)) { if (skip) { |