summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2012-10-24 18:05:51 +0200
committerFrederic Weisbecker <fweisbec@gmail.com>2012-10-29 21:31:31 +0100
commit11113334d1c5dd5355c86e531c29f1202a855c86 (patch)
tree259c7c3344733444ca39263b1a79f40b243b155f /arch/ia64
parentdcbf832e5823156e8f155359b47bd108cac8ad68 (diff)
downloadlinux-3.10-11113334d1c5dd5355c86e531c29f1202a855c86.tar.gz
linux-3.10-11113334d1c5dd5355c86e531c29f1202a855c86.tar.bz2
linux-3.10-11113334d1c5dd5355c86e531c29f1202a855c86.zip
vtime: Make vtime_account_system() irqsafe
vtime_account_system() currently has only one caller with vtime_account() which is irq safe. Now we are going to call it from other places like kvm where irqs are not always disabled by the time we account the cputime. So let's make it irqsafe. The arch implementation part is now prefixed with "__". vtime_account_idle() arch implementation is prefixed accordingly to stay consistent. 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> Cc: Tony Luck <tony.luck@intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index f6388216080..5e4850305d3 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -106,9 +106,9 @@ void vtime_task_switch(struct task_struct *prev)
struct thread_info *ni = task_thread_info(current);
if (idle_task(smp_processor_id()) != prev)
- vtime_account_system(prev);
+ __vtime_account_system(prev);
else
- vtime_account_idle(prev);
+ __vtime_account_idle(prev);
vtime_account_user(prev);
@@ -135,14 +135,14 @@ static cputime_t vtime_delta(struct task_struct *tsk)
return delta_stime;
}
-void vtime_account_system(struct task_struct *tsk)
+void __vtime_account_system(struct task_struct *tsk)
{
cputime_t delta = vtime_delta(tsk);
account_system_time(tsk, 0, delta, delta);
}
-void vtime_account_idle(struct task_struct *tsk)
+void __vtime_account_idle(struct task_struct *tsk)
{
account_idle_time(vtime_delta(tsk));
}