---

yaml --- r: 71485 b: refs/heads/master c: 270f722 h: refs/heads/master i: 71483: 1cb24cd v: v3
git-mirror · Oct 19, 2007 · 3e14014 · 3e14014
1 parent 4adf981
commit 3e14014
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d85f50d5e1aa99ab082035f94265847521819e58
+refs/heads/master: 270f722d4d5f94b02fd48eed47e57917ab00a858
diff --git a/trunk/fs/proc/array.c b/trunk/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/trunk/kernel/fork.c b/trunk/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/trunk/kernel/sched.c b/trunk/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);