diff options
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 01196d3ad452..a120a4549d48 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -119,18 +119,23 @@ static inline void task_name(struct seq_file *m, struct task_struct *p) | |||
119 | * simple bit tests. | 119 | * simple bit tests. |
120 | */ | 120 | */ |
121 | static const char * const task_state_array[] = { | 121 | static const char * const task_state_array[] = { |
122 | "R (running)", /* 0 */ | 122 | |
123 | "S (sleeping)", /* 1 */ | 123 | /* states in TASK_REPORT: */ |
124 | "D (disk sleep)", /* 2 */ | 124 | "R (running)", /* 0x00 */ |
125 | "T (stopped)", /* 4 */ | 125 | "S (sleeping)", /* 0x01 */ |
126 | "t (tracing stop)", /* 8 */ | 126 | "D (disk sleep)", /* 0x02 */ |
127 | "X (dead)", /* 16 */ | 127 | "T (stopped)", /* 0x04 */ |
128 | "Z (zombie)", /* 32 */ | 128 | "t (tracing stop)", /* 0x08 */ |
129 | "X (dead)", /* 0x10 */ | ||
130 | "Z (zombie)", /* 0x20 */ | ||
131 | |||
132 | /* states beyond TASK_REPORT: */ | ||
133 | "I (idle)", /* 0x40 */ | ||
129 | }; | 134 | }; |
130 | 135 | ||
131 | static inline const char *get_task_state(struct task_struct *tsk) | 136 | static inline const char *get_task_state(struct task_struct *tsk) |
132 | { | 137 | { |
133 | BUILD_BUG_ON(1 + ilog2(TASK_REPORT) != ARRAY_SIZE(task_state_array) - 1); | 138 | BUILD_BUG_ON(1 + ilog2(TASK_REPORT_MAX) != ARRAY_SIZE(task_state_array)); |
134 | return task_state_array[__get_task_state(tsk)]; | 139 | return task_state_array[__get_task_state(tsk)]; |
135 | } | 140 | } |
136 | 141 | ||