aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEugene Teo <eugeneteo@kernel.sg>2007-10-19 02:40:38 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 14:53:42 -0400
commit270f722d4d5f94b02fd48eed47e57917ab00a858 (patch)
treef6f58a0730c8968d2b4b983965b4409761616ab2 /kernel
parentd85f50d5e1aa99ab082035f94265847521819e58 (diff)
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 <eugeneteo@kernel.sg> Cc: Roland McGrath <roland@redhat.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/fork.c2
-rw-r--r--kernel/sched.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index a794bfcf6003..240aa6601f5b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(free_task);
117 117
118void __put_task_struct(struct task_struct *tsk) 118void __put_task_struct(struct task_struct *tsk)
119{ 119{
120 WARN_ON(!(tsk->exit_state & (EXIT_DEAD | EXIT_ZOMBIE))); 120 WARN_ON(!tsk->exit_state);
121 WARN_ON(atomic_read(&tsk->usage)); 121 WARN_ON(atomic_read(&tsk->usage));
122 WARN_ON(tsk == current); 122 WARN_ON(tsk == current);
123 123
diff --git a/kernel/sched.c b/kernel/sched.c
index 72a809a54d5b..9d458504e3a6 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)
5279 struct rq *rq = cpu_rq(dead_cpu); 5279 struct rq *rq = cpu_rq(dead_cpu);
5280 5280
5281 /* Must be exiting, otherwise would be on tasklist. */ 5281 /* Must be exiting, otherwise would be on tasklist. */
5282 BUG_ON(p->exit_state != EXIT_ZOMBIE && p->exit_state != EXIT_DEAD); 5282 BUG_ON(!p->exit_state);
5283 5283
5284 /* Cannot have done final schedule yet: would have vanished. */ 5284 /* Cannot have done final schedule yet: would have vanished. */
5285 BUG_ON(p->state == TASK_DEAD); 5285 BUG_ON(p->state == TASK_DEAD);