diff options
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r-- | fs/proc/array.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 5e9251f65317..7eb1bd7f800c 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c | |||
@@ -330,7 +330,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole) | |||
330 | unsigned long min_flt = 0, maj_flt = 0; | 330 | unsigned long min_flt = 0, maj_flt = 0; |
331 | cputime_t cutime, cstime, utime, stime; | 331 | cputime_t cutime, cstime, utime, stime; |
332 | unsigned long rsslim = 0; | 332 | unsigned long rsslim = 0; |
333 | unsigned long it_real_value = 0; | 333 | DEFINE_KTIME(it_real_value); |
334 | struct task_struct *t; | 334 | struct task_struct *t; |
335 | char tcomm[sizeof(task->comm)]; | 335 | char tcomm[sizeof(task->comm)]; |
336 | 336 | ||
@@ -386,7 +386,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole) | |||
386 | utime = cputime_add(utime, task->signal->utime); | 386 | utime = cputime_add(utime, task->signal->utime); |
387 | stime = cputime_add(stime, task->signal->stime); | 387 | stime = cputime_add(stime, task->signal->stime); |
388 | } | 388 | } |
389 | it_real_value = task->signal->it_real_value; | 389 | it_real_value = task->signal->real_timer.expires; |
390 | } | 390 | } |
391 | ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; | 391 | ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; |
392 | read_unlock(&tasklist_lock); | 392 | read_unlock(&tasklist_lock); |
@@ -435,7 +435,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole) | |||
435 | priority, | 435 | priority, |
436 | nice, | 436 | nice, |
437 | num_threads, | 437 | num_threads, |
438 | jiffies_to_clock_t(it_real_value), | 438 | (long) ktime_to_clock_t(it_real_value), |
439 | start_time, | 439 | start_time, |
440 | vsize, | 440 | vsize, |
441 | mm ? get_mm_rss(mm) : 0, | 441 | mm ? get_mm_rss(mm) : 0, |