From 1d56b29b62a34dbb51959e971f1e4b4262e1f0ee Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Wed, 14 Nov 2012 00:26:54 +0100 Subject: [PATCH] --- yaml --- r: 339097 b: refs/heads/master c: 1017769bd0073f0a73e066377cd79a10cf0a33ab h: refs/heads/master i: 339095: 79ed27eb360da1c4a4e5edefc2ff00bc181dba42 v: v3 --- [refs] | 2 +- trunk/kernel/sched/cputime.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 52f05b7ddb33..74563865b6e6 100644 --- 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 index 2e8d34aac97e..80b2fd5a7cf0 100644 --- 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 */