summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-31 12:25:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-31 12:25:28 -0700
commitad8946fbf913fff8671cbaee776d23c3d07173fa (patch)
treee02bb76e425bd8c34445aef5d3ea30021ff57892 /arch
parent918d80a136430aeb23659aa75f8b415090500667 (diff)
parent7743a536beda6225eef4a0758c5370f761fb0616 (diff)
downloadlinux-ad8946fbf913fff8671cbaee776d23c3d07173fa.tar.bz2
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)
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/dumpstack_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index f2a1770ca176..a21d49c071db 100644
--- 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;
}