Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13e57da4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 debug update from Ingo Molnar:
 "A single change enhancing stack traces by hiding wrapper function
  entries"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/stacktrace: Avoid recording save_stack_trace() wrappers
parents eb4d47c8 77072f09

arch/x86/kernel/stacktrace.c

+7 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int save_stack_address(struct stack_trace *trace, unsigned long addr, 
	return 0;

}



static void __save_stack_trace(struct stack_trace *trace,

static void noinline __save_stack_trace(struct stack_trace *trace,

			       struct task_struct *task, struct pt_regs *regs,

			       bool nosched)

{
@@ -56,6 +56,7 @@ static void __save_stack_trace(struct stack_trace *trace, 
 */

void save_stack_trace(struct stack_trace *trace)

{

	trace->skip++;

	__save_stack_trace(trace, current, NULL, false);

}

EXPORT_SYMBOL_GPL(save_stack_trace);
@@ -70,6 +71,8 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) 
	if (!try_get_task_stack(tsk))

		return;



	if (tsk == current)

		trace->skip++;

	__save_stack_trace(trace, tsk, NULL, true);



	put_task_stack(tsk);
@@ -88,7 +91,8 @@ EXPORT_SYMBOL_GPL(save_stack_trace_tsk); 
	}							\

})



static int __save_stack_trace_reliable(struct stack_trace *trace,

static int __always_inline

__save_stack_trace_reliable(struct stack_trace *trace,

			    struct task_struct *task)

{

	struct unwind_state state;