aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/array.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r--fs/proc/array.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 525157ca25cb..01196d3ad452 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -130,19 +130,8 @@ static const char * const task_state_array[] = {
130 130
131static inline const char *get_task_state(struct task_struct *tsk) 131static inline const char *get_task_state(struct task_struct *tsk)
132{ 132{
133 unsigned int state = (tsk->state | tsk->exit_state) & TASK_REPORT; 133 BUILD_BUG_ON(1 + ilog2(TASK_REPORT) != ARRAY_SIZE(task_state_array) - 1);
134 134 return task_state_array[__get_task_state(tsk)];
135 /*
136 * Parked tasks do not run; they sit in __kthread_parkme().
137 * Without this check, we would report them as running, which is
138 * clearly wrong, so we report them as sleeping instead.
139 */
140 if (tsk->state == TASK_PARKED)
141 state = TASK_INTERRUPTIBLE;
142
143 BUILD_BUG_ON(1 + ilog2(TASK_REPORT) != ARRAY_SIZE(task_state_array)-1);
144
145 return task_state_array[fls(state)];
146} 135}
147 136
148static inline int get_task_umask(struct task_struct *tsk) 137static inline int get_task_umask(struct task_struct *tsk)