diff --git a/[refs] b/[refs] index 67e17200c6a1..bf17ae5e7915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21498223daad359d048b35b0ee4d1b93300ef258 +refs/heads/master: 1587e2b1880632d959db6ac9e79cb1d99a73c656 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 65c62e1bfd6f..5be663e5dad1 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -141,12 +141,7 @@ static const char *task_state_array[] = { static inline const char *get_task_state(struct task_struct *tsk) { - unsigned int state = (tsk->state & (TASK_RUNNING | - TASK_INTERRUPTIBLE | - TASK_UNINTERRUPTIBLE | - TASK_STOPPED | - TASK_TRACED)) | - tsk->exit_state; + unsigned int state = (tsk->state & TASK_REPORT) | tsk->exit_state; const char **p = &task_state_array[0]; while (state) {