From 7a6ebcc18c4bcda2620cb0b405ce811b72bbbd89 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sat, 28 Jan 2012 13:52:46 +0300 Subject: [PATCH] --- yaml --- r: 287129 b: refs/heads/master c: d0caf292505d051b1026e85faf3a85e907566f31 h: refs/heads/master i: 287127: 4e13af43647a4949f967fc1dbb5931666e594950 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/dumpstack_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9767d6e31e00..35d1a05b64fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e050e3f0a71bf7dc2c148b35caff0234decc8198 +refs/heads/master: d0caf292505d051b1026e85faf3a85e907566f31 diff --git a/trunk/arch/x86/kernel/dumpstack_64.c b/trunk/arch/x86/kernel/dumpstack_64.c index 6d728d9284bd..af7785ff5aa0 100644 --- a/trunk/arch/x86/kernel/dumpstack_64.c +++ b/trunk/arch/x86/kernel/dumpstack_64.c @@ -129,7 +129,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, if (!stack) { if (regs) stack = (unsigned long *)regs->sp; - else if (task && task != current) + else if (task != current) stack = (unsigned long *)task->thread.sp; else stack = &dummy;