path: root/kernel/sched/cputime.c
diff options
authorFrederic Weisbecker <fweisbec@gmail.com>2012-10-06 05:23:22 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2012-10-29 21:31:32 +0100
commit3e1df4f506836e6bea1ab61cf88c75c8b1840643 (patch)
tree58be18cf3dce7a407c84ab2532e92bdb8b7ee067 /kernel/sched/cputime.c
parentfa5058f3b63153e0147ef65bcdb3a4ee63581346 (diff)
cputime: Separate irqtime accounting from generic vtime
vtime_account() doesn't have the same role in CONFIG_VIRT_CPU_ACCOUNTING and CONFIG_IRQ_TIME_ACCOUNTING. In the first case it handles time accounting in any context. In the second case it only handles irq time accounting. So when vtime_account() is called from outside vtime_account_irq_*() this call is pointless to CONFIG_IRQ_TIME_ACCOUNTING. To fix the confusion, change vtime_account() to irqtime_account_irq() in CONFIG_IRQ_TIME_ACCOUNTING. This way we ensure future account_vtime() calls won't waste useless cycles in the irqtime APIs. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'kernel/sched/cputime.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index 0359f47b0ae..8d859dae5be 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -43,7 +43,7 @@ DEFINE_PER_CPU(seqcount_t, irq_time_seq);
* Called before incrementing preempt_count on {soft,}irq_enter
* and before decrementing preempt_count on {soft,}irq_exit.
-void vtime_account(struct task_struct *curr)
+void irqtime_account_irq(struct task_struct *curr)
unsigned long flags;
s64 delta;
@@ -73,7 +73,7 @@ void vtime_account(struct task_struct *curr)
static int irqtime_account_hi_update(void)