diff --git a/[refs] b/[refs] index 90637681b396..a00f58f0678b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44d90df6b757c59651ddd55f1a84f28132b50d29 +refs/heads/master: 464763cf1c6df632dccc8f2f4c7e50163154a2c0 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 4badde179b18..96361e8fa3a8 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -138,9 +138,12 @@ static const char *task_state_array[] = { "S (sleeping)", /* 1 */ "D (disk sleep)", /* 2 */ "T (stopped)", /* 4 */ - "T (tracing stop)", /* 8 */ + "t (tracing stop)", /* 8 */ "Z (zombie)", /* 16 */ - "X (dead)" /* 32 */ + "X (dead)", /* 32 */ + "x (dead)", /* 64 */ + "K (wakekill)", /* 128 */ + "W (waking)", /* 256 */ }; static inline const char *get_task_state(struct task_struct *tsk)