Merge branch 'core-stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (3f612813) · Commits · 戴 / test

kernel/stacktrace.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ unsigned int stack_trace_save_tsk(struct task_struct tsk, unsigned long store,
		.store = store,
		.size = size,
		/* skip this function if they are tracing us */
		.skip = skipnr + !!(current == tsk),
		.skip = skipnr + (current == tsk),
		};

		if (!try_get_task_stack(tsk))
		@@ -300,7 +300,7 @@ unsigned int stack_trace_save_tsk(struct task_struct *task,
		.entries = store,
		.max_entries = size,
		/* skip this function if they are tracing us */
		.skip = skipnr + !!(current == task),
		.skip = skipnr + (current == task),
		};

		save_stack_trace_tsk(task, &trace);