diff options
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 6a91e6ffbcbd..cbd0f1b324b9 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -143,6 +143,7 @@ static const char * const task_state_array[] = { | |||
143 | "x (dead)", /* 64 */ | 143 | "x (dead)", /* 64 */ |
144 | "K (wakekill)", /* 128 */ | 144 | "K (wakekill)", /* 128 */ |
145 | "W (waking)", /* 256 */ | 145 | "W (waking)", /* 256 */ |
146 | "P (parked)", /* 512 */ | ||
146 | }; | 147 | }; |
147 | 148 | ||
148 | static inline const char *get_task_state(struct task_struct *tsk) | 149 | static inline const char *get_task_state(struct task_struct *tsk) |
@@ -449,7 +450,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
449 | do { | 450 | do { |
450 | min_flt += t->min_flt; | 451 | min_flt += t->min_flt; |
451 | maj_flt += t->maj_flt; | 452 | maj_flt += t->maj_flt; |
452 | gtime += t->gtime; | 453 | gtime += task_gtime(t); |
453 | t = next_thread(t); | 454 | t = next_thread(t); |
454 | } while (t != task); | 455 | } while (t != task); |
455 | 456 | ||
@@ -472,7 +473,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, | |||
472 | min_flt = task->min_flt; | 473 | min_flt = task->min_flt; |
473 | maj_flt = task->maj_flt; | 474 | maj_flt = task->maj_flt; |
474 | task_cputime_adjusted(task, &utime, &stime); | 475 | task_cputime_adjusted(task, &utime, &stime); |
475 | gtime = task->gtime; | 476 | gtime = task_gtime(task); |
476 | } | 477 | } |
477 | 478 | ||
478 | /* scale priority and nice values from timeslices to -20..20 */ | 479 | /* scale priority and nice values from timeslices to -20..20 */ |