Merge "arm64: stacktrace: avoid listing stacktrace functions in stacktrace" (deda3d6e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/kernel/stacktrace.c

+13 −5

Original line number	Diff line number	Diff line
		@@ -176,7 +176,8 @@ void save_stack_trace_regs(struct pt_regs regs, struct stack_trace trace)
		trace->entries[trace->nr_entries++] = ULONG_MAX;
		}

		void save_stack_trace_tsk(struct task_struct tsk, struct stack_trace trace)
		static noinline void __save_stack_trace(struct task_struct *tsk,
		struct stack_trace *trace, unsigned int nosched)
		{
		struct stack_trace_data data;
		struct stackframe frame;
		@@ -186,17 +187,18 @@ void save_stack_trace_tsk(struct task_struct tsk, struct stack_trace trace)

		data.trace = trace;
		data.skip = trace->skip;
		data.no_sched_functions = nosched;

		if (tsk != current) {
		data.no_sched_functions = 1;
		frame.fp = thread_saved_fp(tsk);
		frame.sp = thread_saved_sp(tsk);
		frame.pc = thread_saved_pc(tsk);
		} else {
		data.no_sched_functions = 0;
		/* We don't want this function nor the caller */
		data.skip += 2;
		frame.fp = (unsigned long)__builtin_frame_address(0);
		frame.sp = current_stack_pointer;
		frame.pc = (unsigned long)save_stack_trace_tsk;
		frame.pc = (unsigned long)__save_stack_trace;
		}
		#ifdef CONFIG_FUNCTION_GRAPH_TRACER
		frame.graph = tsk->curr_ret_stack;
		@@ -210,9 +212,15 @@ void save_stack_trace_tsk(struct task_struct tsk, struct stack_trace trace)
		}
		EXPORT_SYMBOL(save_stack_trace_tsk);

		void save_stack_trace_tsk(struct task_struct tsk, struct stack_trace trace)
		{
		__save_stack_trace(tsk, trace, 1);
		}

		void save_stack_trace(struct stack_trace *trace)
		{
		save_stack_trace_tsk(current, trace);
		__save_stack_trace(current, trace, 0);
		}

		EXPORT_SYMBOL_GPL(save_stack_trace);
		#endif