projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[cascardo/linux.git]
/
fs
/
proc
/
array.c
diff --git
a/fs/proc/array.c
b/fs/proc/array.c
index
656e401
..
64db2bc
100644
(file)
--- 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)