Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 5 insertions, 5 deletions

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 4e5288a831de..157de3a47832 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -58,21 +58,21 @@ void thread_group_cputime(
         struct task_struct *tsk,
         struct task_cputime *times)
 {
-        struct signal_struct *sig;
+        struct task_cputime *totals, *tot;
         int i;
-        struct task_cputime *tot;
 
-        sig = tsk->signal;
-        if (unlikely(!sig) || !sig->cputime.totals) {
+        totals = tsk->signal->cputime.totals;
+        if (!totals) {
                 times->utime = tsk->utime;
                 times->stime = tsk->stime;
                 times->sum_exec_runtime = tsk->se.sum_exec_runtime;
                 return;
         }
+
         times->stime = times->utime = cputime_zero;
         times->sum_exec_runtime = 0;
         for_each_possible_cpu(i) {
-                tot = per_cpu_ptr(tsk->signal->cputime.totals, i);
+                tot = per_cpu_ptr(totals, i);
                 times->utime = cputime_add(times->utime, tot->utime);
                 times->stime = cputime_add(times->stime, tot->stime);
                 times->sum_exec_runtime += tot->sum_exec_runtime;