From: Andrew Morton <akpm@osdl.org>

- Restore BUG_ON check

- Don't reevaluate current

Cc: Coywolf Qi Hunt <qiyong@fc-cn.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/exit.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN kernel/exit.c~pf_dead-cleanup-fixes kernel/exit.c
--- devel/kernel/exit.c~pf_dead-cleanup-fixes	2005-10-11 21:20:44.000000000 -0700
+++ devel-akpm/kernel/exit.c	2005-10-11 21:20:44.000000000 -0700
@@ -867,7 +867,8 @@ fastcall NORET_TYPE void do_exit(long co
 
 	/* PF_DEAD causes final put_task_struct after we schedule. */
 	preempt_disable();
-	current->flags |= PF_DEAD;
+	BUG_ON(tsk->flags & PF_DEAD);
+	tsk->flags |= PF_DEAD;
 
 	schedule();
 	BUG();
_