hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eugene Teo 2007-10-18 23:40:38 -07:00 committed by Linus Torvalds
parent d85f50d5e1
commit 270f722d4d
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/proc/array.c
View File

@ -146,8 +146,7 @@ static inline const char *get_task_state(struct task_struct *tsk)
TASK_UNINTERRUPTIBLE | TASK_UNINTERRUPTIBLE |
TASK_STOPPED | TASK_STOPPED |
TASK_TRACED)) | TASK_TRACED)) |
(tsk->exit_state & (EXIT_ZOMBIE | tsk->exit_state;
EXIT_DEAD));
const char **p = &task_state_array[0]; const char **p = &task_state_array[0];
while (state) { while (state) {

2
kernel/fork.c
View File

@ -117,7 +117,7 @@ EXPORT_SYMBOL(free_task);
void __put_task_struct(struct task_struct *tsk) 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(atomic_read(&tsk->usage));
WARN_ON(tsk == current); WARN_ON(tsk == current);

2
kernel/sched.c
View File

@ -5279,7 +5279,7 @@ static void migrate_dead(unsigned int dead_cpu, struct task_struct *p)
struct rq *rq = cpu_rq(dead_cpu); struct rq *rq = cpu_rq(dead_cpu);
/* Must be exiting, otherwise would be on tasklist. */ /* 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. */ /* Cannot have done final schedule yet: would have vanished. */
BUG_ON(p->state == TASK_DEAD); BUG_ON(p->state == TASK_DEAD);