---

yaml --- r: 339097 b: refs/heads/master c: 1017769 h: refs/heads/master i: 339095: 79ed27e v: v3
git-mirror · Nov 19, 2012 · 1d56b29 · 1d56b29
1 parent 04b1ccd
commit 1d56b29
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3942ba04052364d3c6454103362cafd87456010
+refs/heads/master: 1017769bd0073f0a73e066377cd79a10cf0a33ab
diff --git a/trunk/kernel/sched/cputime.c b/trunk/kernel/sched/cputime.c
@@ -467,16 +467,10 @@ void vtime_task_switch(struct task_struct *prev)
 #ifndef __ARCH_HAS_VTIME_ACCOUNT
 void vtime_account(struct task_struct *tsk)
 {
-	unsigned long flags;
-
-	local_irq_save(flags);
-
 	if (in_interrupt() || !is_idle_task(tsk))
 		vtime_account_system(tsk);
 	else
 		vtime_account_idle(tsk);
-
-	local_irq_restore(flags);
 }
 EXPORT_SYMBOL_GPL(vtime_account);
 #endif /* __ARCH_HAS_VTIME_ACCOUNT */