From 5f5d5d584fa3a32ab10f40e7aea6f4c58e7c8c7a Mon Sep 17 00:00:00 2001
From: Matt Helsley <matthltc@us.ibm.com>
Date: Sun, 25 Jun 2006 05:48:03 -0700
Subject: [PATCH] --- yaml --- r: 29721 b: refs/heads/master c:
 11e64757f9fb32f13f51596bbf01988f42fca764 h: refs/heads/master i:   29719:
 3500f9f97e6cfc41aa29399a5997023bf9f14348 v: v3

---
 [refs]              | 2 +-
 trunk/kernel/acct.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 750b56319ade..abefe9e6f1d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c12d81134b130ccd4c286b434ca48c4cda71a2f
+refs/heads/master: 11e64757f9fb32f13f51596bbf01988f42fca764
diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c
index 6802020e0ceb..44dd6bd63517 100644
--- a/trunk/kernel/acct.c
+++ b/trunk/kernel/acct.c
@@ -599,9 +599,7 @@ void acct_update_integrals(struct task_struct *tsk)
  */
 void acct_clear_integrals(struct task_struct *tsk)
 {
-	if (tsk) {
-		tsk->acct_stimexpd = 0;
-		tsk->acct_rss_mem1 = 0;
-		tsk->acct_vm_mem1 = 0;
-	}
+	tsk->acct_stimexpd = 0;
+	tsk->acct_rss_mem1 = 0;
+	tsk->acct_vm_mem1 = 0;
 }