diff options
| author |   Rob Herring <robh@kernel.org> | 2018-03-08 09:21:07 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-03-08 09:21:07 -0600 |
| commit | c679fa6e3aaa5c58fc514b5b88cfa82774b8d390 (patch) | |
| tree | 0c10b339368bd1795152a66a4e245e6f654fb3ec /arch/arm64/kernel/time.c | |
| parent | of: unittest: fix an error test in of_unittest_overlay_8() (diff) | |
| parent | scripts: turn off some new dtc warnings by default (diff) | |
Merge branch 'dtc-update' into dt/next
Diffstat (limited to 'arch/arm64/kernel/time.c')
| -rw-r--r-- | arch/arm64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index a4391280fba9..f258636273c9 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -52,7 +52,7 @@ unsigned long profile_pc(struct pt_regs *regs) frame.fp = regs->regs[29]; frame.pc = regs->pc; #ifdef CONFIG_FUNCTION_GRAPH_TRACER - frame.graph = -1; /* no task info */ + frame.graph = current->curr_ret_stack; #endif do { int ret = unwind_frame(NULL, &frame); |