On Thu, 6 Dec 2018 15:49:32 +0000 Will Deacon <[email protected]> wrote:
> On Wed, Dec 05, 2018 at 06:47:54PM -0500, Steven Rostedt wrote: > > From: "Steven Rostedt (VMware)" <[email protected]> > > > > Functions in the set_graph_notrace no longer subtract FTRACE_NOTRACE_DEPTH > > from curr_ret_stack, as that is now implemented via the trace_recursion > > flags. Access to curr_ret_stack no longer needs to worry about checking for > > this. curr_ret_stack is still initialized to -1, when there's not a shadow > > stack allocated. > > > > Cc: Catalin Marinas <[email protected]> > > Cc: Will Deacon <[email protected]> > > Cc: [email protected] > > Reviewed-by: Joel Fernandes (Google) <[email protected]> > > Signed-off-by: Steven Rostedt (VMware) <[email protected]> > > --- > > arch/arm64/kernel/stacktrace.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c > > index 4989f7ea1e59..7723dadf25be 100644 > > --- a/arch/arm64/kernel/stacktrace.c > > +++ b/arch/arm64/kernel/stacktrace.c > > @@ -61,9 +61,6 @@ int notrace unwind_frame(struct task_struct *tsk, struct > > stackframe *frame) > > (frame->pc == (unsigned long)return_to_handler)) { > > if (WARN_ON_ONCE(frame->graph == -1)) > > return -EINVAL; > > - if (frame->graph < -1) > > - frame->graph += FTRACE_NOTRACE_DEPTH; > > - > > Acked-by: Will Deacon <[email protected]> > Thanks Will! -- Steve
