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; }