diff --git a/[refs] b/[refs] index 88d1836053dd..3023ffc9bc05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c673f1a9d994de501b674b2bb6a48bd5e912afe0 +refs/heads/master: 028a690a1ebc8b825b6f42214a99a5abcf9aa4c6 diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps.c index e6b5309e70f3..57772a18c394 100644 --- a/trunk/arch/i386/kernel/traps.c +++ b/trunk/arch/i386/kernel/traps.c @@ -152,7 +152,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, if (!stack) { unsigned long dummy; stack = &dummy; - if (task && task != current) + if (task != current) stack = (unsigned long *)task->thread.esp; }