diff options
| author | Paul Moore <[email protected]> | 2014-06-17 21:30:23 +0000 |
|---|---|---|
| committer | Paul Moore <[email protected]> | 2014-06-17 21:30:23 +0000 |
| commit | 170b5910d9fbea79de1bb40df22eda5f98250c0c (patch) | |
| tree | ca9560e878d2842d45c6f99077d0d8b8f8b0f9ba /fs/proc/array.c | |
| parent | selinux: conditionally reschedule in hashtab_insert while loading selinux policy (diff) | |
| parent | Linux 3.15 (diff) | |
| download | kernel-170b5910d9fbea79de1bb40df22eda5f98250c0c.tar.gz kernel-170b5910d9fbea79de1bb40df22eda5f98250c0c.zip | |
Merge tag 'v3.15' into next
Linux 3.15
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 656e401794de..64db2bceac59 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -138,8 +138,8 @@ static const char * const task_state_array[] = { "D (disk sleep)", /* 2 */ "T (stopped)", /* 4 */ "t (tracing stop)", /* 8 */ - "Z (zombie)", /* 16 */ - "X (dead)", /* 32 */ + "X (dead)", /* 16 */ + "Z (zombie)", /* 32 */ }; static inline const char *get_task_state(struct task_struct *tsk) |