ARM: fix scheduling while atomic warning in alignment handling code

[deliverable/linux.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index e6e0ece5f6a04401506d62fb602d7034d4273fe1..265b37690421897afe6f133953e21c8bbf5632ad 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1046,7 +1046,7 @@ void do_sys_times(struct tms *tms)
        cputime_t tgutime, tgstime, cutime, cstime;
 
        spin_lock_irq(&current->sighand->siglock);
-       thread_group_times(current, &tgutime, &tgstime);
+       thread_group_cputime_adjusted(current, &tgutime, &tgstime);
        cutime = current->signal->cutime;
        cstime = current->signal->cstime;
        spin_unlock_irq(&current->sighand->siglock);
@@ -1704,7 +1704,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
        utime = stime = 0;
 
        if (who == RUSAGE_THREAD) {
-               task_times(current, &utime, &stime);
+               task_cputime_adjusted(current, &utime, &stime);
                accumulate_thread_rusage(p, r);
                maxrss = p->signal->maxrss;
                goto out;
@@ -1730,7 +1730,7 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
                                break;
 
                case RUSAGE_SELF:
-                       thread_group_times(p, &tgutime, &tgstime);
+                       thread_group_cputime_adjusted(p, &tgutime, &tgstime);
                        utime += tgutime;
                        stime += tgstime;
                        r->ru_nvcsw += p->signal->nvcsw;