Commit ad8946fb authored Mar 31, 2014 by Linus Torvalds

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

Pull x86 debug cleanup from Ingo Molnar:
 "A single trivial cleanup"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  i386: Remove unneeded test of 'task' in dump_trace() (again)

parents 918d80a1 7743a536

arch/x86/kernel/dumpstack_32.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ void dump_trace(struct task_struct task, struct pt_regs regs,
		unsigned long dummy;

		stack = &dummy;
		if (task && task != current)
		if (task != current)
		stack = (unsigned long *)task->thread.sp;
		}