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

Commit 20c7e296 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull stacktrace fix from Thomas Gleixner:
 "A small fix for a stacktrace regression.

  Saving a stacktrace for a foreign task skipped an extra entry which
  makes e.g. the output of /proc/$PID/stack incomplete"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  stacktrace: Don't skip first entry on noncurrent tasks
parents 79a64063 b0c51f15

kernel/stacktrace.c

+4 −2
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ unsigned int stack_trace_save_tsk(struct task_struct *tsk, unsigned long *store, 
	struct stacktrace_cookie c = {

		.store	= store,

		.size	= size,

		.skip	= skipnr + 1,

		/* skip this function if they are tracing us */

		.skip	= skipnr + !!(current == tsk),

	};



	if (!try_get_task_stack(tsk))
@@ -298,7 +299,8 @@ unsigned int stack_trace_save_tsk(struct task_struct *task, 
	struct stack_trace trace = {

		.entries	= store,

		.max_entries	= size,

		.skip		= skipnr + 1,

		/* skip this function if they are tracing us */

		.skip	= skipnr + !!(current == task),

	};



	save_stack_trace_tsk(task, &trace);