From 3645d5529e0b90fd50e710850d9bbb18028dd77f Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Mon, 17 Nov 2008 15:40:08 +0100
Subject: [PATCH] --- yaml --- r: 123184 b: refs/heads/master c:
 2b5fe6de58276d0b5a7c884d5dbfc300ca47db78 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/kernel/exit.c | 2 +-
 trunk/kernel/sys.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index afbfb59a3801..525371a65409 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce394471d13bf071939a9a0b48c64c297676d233
+refs/heads/master: 2b5fe6de58276d0b5a7c884d5dbfc300ca47db78
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index ae2b92be5fae..b9c4d8bb72e5 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -1330,10 +1330,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,
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index 31deba8f7d16..5fc3a0cfb994 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -858,8 +858,8 @@ void do_sys_times(struct tms *tms)
 	struct task_cputime cputime;
 	cputime_t cutime, cstime;
 
-	spin_lock_irq(&current->sighand->siglock);
 	thread_group_cputime(current, &cputime);
+	spin_lock_irq(&current->sighand->siglock);
 	cutime = current->signal->cutime;
 	cstime = current->signal->cstime;
 	spin_unlock_irq(&current->sighand->siglock);