---

yaml --- r: 132120 b: refs/heads/master c: 6d5b5ac h: refs/heads/master v: v3
git-mirror · Mar 9, 2009 · 3af617b · 3af617b
1 parent fa3cd19
commit 3af617b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a203f3b089be4410fe065dd9927027eade94557
+refs/heads/master: 6d5b5acca9e566515ef3f1ed617e7295c4f94345
diff --git a/trunk/kernel/tsacct.c b/trunk/kernel/tsacct.c
@@ -122,19 +122,23 @@ void acct_update_integrals(struct task_struct *tsk)
 	if (likely(tsk->mm)) {
 		cputime_t time, dtime;
 		struct timeval value;
+		unsigned long flags;
 		u64 delta;
 
+		local_irq_save(flags);
 		time = tsk->stime + tsk->utime;
 		dtime = cputime_sub(time, tsk->acct_timexpd);
 		jiffies_to_timeval(cputime_to_jiffies(dtime), &value);
 		delta = value.tv_sec;
 		delta = delta * USEC_PER_SEC + value.tv_usec;
 
 		if (delta == 0)
-			return;
+			goto out;
 		tsk->acct_timexpd = time;
 		tsk->acct_rss_mem1 += delta * get_mm_rss(tsk->mm);
 		tsk->acct_vm_mem1 += delta * tsk->mm->total_vm;
+	out:
+		local_irq_restore(flags);
 	}
 }