|
@@ -1138,6 +1138,7 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)
|
|
|
{
|
|
|
struct rusage32 r;
|
|
|
cputime_t utime, stime;
|
|
|
+ unsigned long utime_jiffies, stime_jiffies;
|
|
|
|
|
|
if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN)
|
|
|
return -EINVAL;
|
|
@@ -1146,14 +1147,18 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)
|
|
|
switch (who) {
|
|
|
case RUSAGE_SELF:
|
|
|
task_cputime(current, &utime, &stime);
|
|
|
- jiffies_to_timeval32(utime, &r.ru_utime);
|
|
|
- jiffies_to_timeval32(stime, &r.ru_stime);
|
|
|
+ utime_jiffies = cputime_to_jiffies(utime);
|
|
|
+ stime_jiffies = cputime_to_jiffies(stime);
|
|
|
+ jiffies_to_timeval32(utime_jiffies, &r.ru_utime);
|
|
|
+ jiffies_to_timeval32(stime_jiffies, &r.ru_stime);
|
|
|
r.ru_minflt = current->min_flt;
|
|
|
r.ru_majflt = current->maj_flt;
|
|
|
break;
|
|
|
case RUSAGE_CHILDREN:
|
|
|
- jiffies_to_timeval32(current->signal->cutime, &r.ru_utime);
|
|
|
- jiffies_to_timeval32(current->signal->cstime, &r.ru_stime);
|
|
|
+ utime_jiffies = cputime_to_jiffies(current->signal->cutime);
|
|
|
+ stime_jiffies = cputime_to_jiffies(current->signal->cstime);
|
|
|
+ jiffies_to_timeval32(utime_jiffies, &r.ru_utime);
|
|
|
+ jiffies_to_timeval32(stime_jiffies, &r.ru_stime);
|
|
|
r.ru_minflt = current->signal->cmin_flt;
|
|
|
r.ru_majflt = current->signal->cmaj_flt;
|
|
|
break;
|