|
@@ -1145,7 +1145,7 @@ struct rusage32 {
|
|
|
SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)
|
|
|
{
|
|
|
struct rusage32 r;
|
|
|
- cputime_t utime, stime;
|
|
|
+ u64 utime, stime;
|
|
|
unsigned long utime_jiffies, stime_jiffies;
|
|
|
|
|
|
if (who != RUSAGE_SELF && who != RUSAGE_CHILDREN)
|
|
@@ -1154,9 +1154,9 @@ SYSCALL_DEFINE2(osf_getrusage, int, who, struct rusage32 __user *, ru)
|
|
|
memset(&r, 0, sizeof(r));
|
|
|
switch (who) {
|
|
|
case RUSAGE_SELF:
|
|
|
- task_cputime_t(current, &utime, &stime);
|
|
|
- utime_jiffies = cputime_to_jiffies(utime);
|
|
|
- stime_jiffies = cputime_to_jiffies(stime);
|
|
|
+ task_cputime(current, &utime, &stime);
|
|
|
+ utime_jiffies = nsecs_to_jiffies(utime);
|
|
|
+ stime_jiffies = nsecs_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;
|