Merge branch 'task_killable' of git://git.kernel.org/pub/scm/linux/kernel/git/willy...

[linux-2.6-omap-h63xx.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index eb97f2897e2b50724046446be149951c1685c650..b380313092bd5e42173af45654e99b5a41aee908 100644 (file)
--- a/fs/proc/array.c
+++ b/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) {