|
@@ -126,20 +126,18 @@ static void __acct_update_integrals(struct task_struct *tsk,
|
|
|
cputime_t utime, cputime_t stime)
|
|
|
{
|
|
|
cputime_t time, dtime;
|
|
|
- unsigned long flags;
|
|
|
u64 delta;
|
|
|
|
|
|
if (!likely(tsk->mm))
|
|
|
return;
|
|
|
|
|
|
- local_irq_save(flags);
|
|
|
time = stime + utime;
|
|
|
dtime = time - tsk->acct_timexpd;
|
|
|
/* Avoid division: cputime_t is often in nanoseconds already. */
|
|
|
delta = cputime_to_nsecs(dtime);
|
|
|
|
|
|
if (delta < TICK_NSEC)
|
|
|
- goto out;
|
|
|
+ return;
|
|
|
|
|
|
tsk->acct_timexpd = time;
|
|
|
/*
|
|
@@ -149,8 +147,6 @@ static void __acct_update_integrals(struct task_struct *tsk,
|
|
|
*/
|
|
|
tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm) >> 10;
|
|
|
tsk->acct_vm_mem1 += delta * tsk->mm->total_vm >> 10;
|
|
|
-out:
|
|
|
- local_irq_restore(flags);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -160,9 +156,12 @@ out:
|
|
|
void acct_update_integrals(struct task_struct *tsk)
|
|
|
{
|
|
|
cputime_t utime, stime;
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
+ local_irq_save(flags);
|
|
|
task_cputime(tsk, &utime, &stime);
|
|
|
__acct_update_integrals(tsk, utime, stime);
|
|
|
+ local_irq_restore(flags);
|
|
|
}
|
|
|
|
|
|
/**
|