aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMatt Helsley <matthltc@us.ibm.com>2006-06-25 08:48:03 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:09 -0400
commit11e64757f9fb32f13f51596bbf01988f42fca764 (patch)
tree9fab5ffe96db5dae318d04f8979a3883ff35df5b /kernel
parent7c12d81134b130ccd4c286b434ca48c4cda71a2f (diff)
[PATCH] Remove unecessary NULL check in kernel/acct.c
copy_process() appears to be the only caller of acct_clear_integrals() and does not pass in NULL task pointers. Remove the unecessary check. Signed-off-by: Matt Helsley <matthltc@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/acct.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/acct.c b/kernel/acct.c
index 6802020e0ceb..44dd6bd63517 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -599,9 +599,7 @@ void acct_update_integrals(struct task_struct *tsk)
599 */ 599 */
600void acct_clear_integrals(struct task_struct *tsk) 600void acct_clear_integrals(struct task_struct *tsk)
601{ 601{
602 if (tsk) { 602 tsk->acct_stimexpd = 0;
603 tsk->acct_stimexpd = 0; 603 tsk->acct_rss_mem1 = 0;
604 tsk->acct_rss_mem1 = 0; 604 tsk->acct_vm_mem1 = 0;
605 tsk->acct_vm_mem1 = 0;
606 }
607} 605}