mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 04:32:03 +00:00
i386: Remove unneeded test of 'task' in dump_trace() (again)
Commit028a690a1e
"i386: Remove unneeded test of 'task' in dump_trace()" correctly removed the unneeded 'task != NULL' check because it would be set to current if it was NULL. Commit2bc5f927d4
"i386: split out dumpstack code from traps_32.c" moved the code from traps_32.c to its own file dump_stack.c for preparation of the i386 / x86_64 merge. Commit8a541665b9
"dumpstack: x86: various small unification steps" worked to make i386 and x86_64 dump_stack logic similar. But this actually reverted the correct change from028a690a1e
. Commitd0caf29250
"x86/dumpstack: Remove unneeded check in dump_trace()" removed the unneeded "task != NULL" check for x86_64 but left that same unneeded check for i386, that was added because x86_64 had it! This chain of events ironically had i386 add back the unneeded task != NULL check because x86_64 did it, and then the fix for x86_64 was fixed by Dan. And even more ironically, it was Dan's smatch bot that told me that a change to dump_stack_32 I made may be wrong if current can be NULL (it can't), as there was a check for it by assigning task to current, and then checking if task is NULL. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Acked-by: Alexander van Heukelum <heukelum@fastmail.fm> Cc: Jesper Juhl <jesper.juhl@gmail.com> Link: http://lkml.kernel.org/r/20140307105242.79a0befd@gandalf.local.home Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
8712a00514
commit
7743a536be
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user