Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

[~andy/linux] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 9a213474f54aa608d682380d24f5cc9d85b77efb..c9e5a1c14e081eb8dd9873e0eef89d964c344bc1 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1326,10 +1326,10 @@ static int wait_task_zombie(struct task_struct *p, int options,
                 * group, which consolidates times for all threads in the
                 * group including the group leader.
                 */
+               thread_group_cputime(p, &cputime);
                spin_lock_irq(&p->parent->sighand->siglock);
                psig = p->parent->signal;
                sig = p->signal;
-               thread_group_cputime(p, &cputime);
                psig->cutime =
                        cputime_add(psig->cutime,
                        cputime_add(cputime.utime,