--- kernel/sys.c

+++ kernel/sys.c

@@ -911,16 +911,15 @@ change_okay:

void do_sys_times(struct tms *tms)

{

- struct task_cputime cputime;

- cputime_t cutime, cstime;

+ cputime_t tgutime, tgstime, cutime, cstime;

- thread_group_cputime(current, &cputime);

spin_lock_irq(&current->sighand->siglock);

+ thread_group_times(current, &tgutime, &tgstime);

cutime = current->signal->cutime;

cstime = current->signal->cstime;

spin_unlock_irq(&current->sighand->siglock);

- tms->tms_utime = cputime_to_clock_t(cputime.utime);

- tms->tms_stime = cputime_to_clock_t(cputime.stime);

+ tms->tms_utime = cputime_to_clock_t(tgutime);

+ tms->tms_stime = cputime_to_clock_t(tgstime);

tms->tms_cutime = cputime_to_clock_t(cutime);

tms->tms_cstime = cputime_to_clock_t(cstime);

}

@@ -963,6 +962,7 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid

pgid = pid;

if (pgid < 0)

return -EINVAL;

+ rcu_read_lock();

/* From this point forward we keep holding onto the tasklist lock

* so that our parent does not change from under us. -DaveM

@@ -1016,6 +1016,7 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid

out:

/* All paths lead to here, thus we are safe. -DaveM */

write_unlock_irq(&tasklist_lock);

+ rcu_read_unlock();

return err;

}

@@ -1338,8 +1339,7 @@ static void k_getrusage(struct task_stru

{

struct task_struct *t;

unsigned long flags;

- cputime_t utime, stime;

- struct task_cputime cputime;

+ cputime_t tgutime, tgstime, utime, stime;

unsigned long maxrss = 0;

memset((char *) r, 0, sizeof *r);

@@ -1373,9 +1373,9 @@ static void k_getrusage(struct task_stru

break;

case RUSAGE_SELF:

- thread_group_cputime(p, &cputime);

- utime = cputime_add(utime, cputime.utime);

- stime = cputime_add(stime, cputime.stime);

+ thread_group_times(p, &tgutime, &tgstime);

+ utime = cputime_add(utime, tgutime);

+ stime = cputime_add(stime, tgstime);

r->ru_nvcsw += p->signal->nvcsw;

r->ru_nivcsw += p->signal->nivcsw;

r->ru_minflt += p->signal->min_flt;