From: Eugene Teo Date: Fri, 19 Oct 2007 06:40:38 +0000 (-0700) Subject: Fix tsk->exit_state usage X-Git-Tag: v2.6.24-rc1~182 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=270f722d4d5f94b02fd48eed47e57917ab00a858;p=linux-2.6-omap-h63xx.git Fix tsk->exit_state usage tsk->exit_state can only be 0, EXIT_ZOMBIE, or EXIT_DEAD. A non-zero test is the same as tsk->exit_state & (EXIT_ZOMBIE | EXIT_DEAD), so just testing tsk->exit_state is sufficient. Signed-off-by: Eugene Teo Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/proc/array.c b/fs/proc/array.c index 04b689f3288..7a34571203b 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -146,8 +146,7 @@ static inline const char *get_task_state(struct task_struct *tsk) TASK_UNINTERRUPTIBLE | TASK_STOPPED | TASK_TRACED)) | - (tsk->exit_state & (EXIT_ZOMBIE | - EXIT_DEAD)); + tsk->exit_state; const char **p = &task_state_array[0]; while (state) { diff --git a/kernel/fork.c b/kernel/fork.c index a794bfcf600..240aa6601f5 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -117,7 +117,7 @@ EXPORT_SYMBOL(free_task); void __put_task_struct(struct task_struct *tsk) { - WARN_ON(!(tsk->exit_state & (EXIT_DEAD | EXIT_ZOMBIE))); + WARN_ON(!tsk->exit_state); WARN_ON(atomic_read(&tsk->usage)); WARN_ON(tsk == current); diff --git a/kernel/sched.c b/kernel/sched.c index 72a809a54d5..9d458504e3a 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5279,7 +5279,7 @@ static void migrate_dead(unsigned int dead_cpu, struct task_struct *p) struct rq *rq = cpu_rq(dead_cpu); /* Must be exiting, otherwise would be on tasklist. */ - BUG_ON(p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD); + BUG_ON(!p->exit_state); /* Cannot have done final schedule yet: would have vanished. */ BUG_ON(p->state == TASK_DEAD);