From db0ec5f71e939b200324288115882729f86555e4 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Mon, 9 Jan 2006 20:54:39 -0800
Subject: [PATCH] --- yaml --- r: 17695 b: refs/heads/master c:
 3795e1616f16905889761536cdc266ebc51855e5 h: refs/heads/master i:   17693:
 971b1536ac5bc717b6e1ce4b14168acdfe98428c   17691:
 3a98896ca7dcf564dd5f53f4a6df79576d55161c   17687:
 87045e013cd720bbec1d823d02ee503c9b15c075   17679:
 365a6620a730bd95485f87d6f49654eb8f7b5613   17663:
 5ac8c4bbdbc0f3df03a5ca909dd83dfe84301b45 v: v3

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

diff --git a/[refs] b/[refs]
index 902acd60130b..31c6252f1819 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a547dfe9563c49fd0f9743640e01d1d652119ec7
+refs/heads/master: 3795e1616f16905889761536cdc266ebc51855e5
diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c
index e75a51f33768..802722814925 100644
--- a/trunk/kernel/exit.c
+++ b/trunk/kernel/exit.c
@@ -1071,6 +1071,9 @@ static int wait_task_zombie(task_t *p, int noreap,
 	}
 
 	if (likely(p->real_parent == p->parent) && likely(p->signal)) {
+		struct signal_struct *psig;
+		struct signal_struct *sig;
+
 		/*
 		 * The resource counters for the group leader are in its
 		 * own task_struct.  Those for dead threads in the group
@@ -1087,24 +1090,26 @@ static int wait_task_zombie(task_t *p, int noreap,
 		 * here reaping other children at the same time.
 		 */
 		spin_lock_irq(&p->parent->sighand->siglock);
-		p->parent->signal->cutime =
-			cputime_add(p->parent->signal->cutime,
+		psig = p->parent->signal;
+		sig = p->signal;
+		psig->cutime =
+			cputime_add(psig->cutime,
 			cputime_add(p->utime,
-			cputime_add(p->signal->utime,
-				    p->signal->cutime)));
-		p->parent->signal->cstime =
-			cputime_add(p->parent->signal->cstime,
+			cputime_add(sig->utime,
+				    sig->cutime)));
+		psig->cstime =
+			cputime_add(psig->cstime,
 			cputime_add(p->stime,
-			cputime_add(p->signal->stime,
-				    p->signal->cstime)));
-		p->parent->signal->cmin_flt +=
-			p->min_flt + p->signal->min_flt + p->signal->cmin_flt;
-		p->parent->signal->cmaj_flt +=
-			p->maj_flt + p->signal->maj_flt + p->signal->cmaj_flt;
-		p->parent->signal->cnvcsw +=
-			p->nvcsw + p->signal->nvcsw + p->signal->cnvcsw;
-		p->parent->signal->cnivcsw +=
-			p->nivcsw + p->signal->nivcsw + p->signal->cnivcsw;
+			cputime_add(sig->stime,
+				    sig->cstime)));
+		psig->cmin_flt +=
+			p->min_flt + sig->min_flt + sig->cmin_flt;
+		psig->cmaj_flt +=
+			p->maj_flt + sig->maj_flt + sig->cmaj_flt;
+		psig->cnvcsw +=
+			p->nvcsw + sig->nvcsw + sig->cnvcsw;
+		psig->cnivcsw +=
+			p->nivcsw + sig->nivcsw + sig->cnivcsw;
 		spin_unlock_irq(&p->parent->sighand->siglock);
 	}