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

torvalds · torvalds · commit ad8946fbf913 · 2014-03-31T12:25:28.000-07:00
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)
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ void dump_trace(struct task_struct task, struct pt_regs regs,`
`30`	`30`	`unsigned long dummy;`
`31`	`31`
`32`	`32`	`stack = &dummy;`
`33`		`- if (task && task != current)`
	`33`	`+ if (task != current)`
`34`	`34`	`stack = (unsigned long *)task->thread.sp;`
`35`	`35`	`}`
`36`	`36`