aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2012-09-08 09:23:11 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2012-09-25 09:31:31 -0400
commitbf9fae9f5e4ca8dce4708812f9ad6281e61df109 (patch)
tree02318ac3db48dd993a4a430de5de66a337895d16 /kernel/softirq.c
parentbc2a27cd27271c5257989a57f511be86b26f5e54 (diff)
cputime: Use a proper subsystem naming for vtime related APIs
Use a naming based on vtime as a prefix for virtual based cputime accounting APIs: - account_system_vtime() -> vtime_account() - account_switch_vtime() -> vtime_task_switch() It makes it easier to allow for further declension such as vtime_account_system(), vtime_account_idle(), ... if we want to find out the context we account to from generic code. This also make it better to know on which subsystem these APIs refer to. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.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: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/softirq.c')
-rw-r--r--kernel/softirq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c
index b73e681df09e..d55e3159f928 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -220,7 +220,7 @@ asmlinkage void __do_softirq(void)
220 current->flags &= ~PF_MEMALLOC; 220 current->flags &= ~PF_MEMALLOC;
221 221
222 pending = local_softirq_pending(); 222 pending = local_softirq_pending();
223 account_system_vtime(current); 223 vtime_account(current);
224 224
225 __local_bh_disable((unsigned long)__builtin_return_address(0), 225 __local_bh_disable((unsigned long)__builtin_return_address(0),
226 SOFTIRQ_OFFSET); 226 SOFTIRQ_OFFSET);
@@ -271,7 +271,7 @@ restart:
271 271
272 lockdep_softirq_exit(); 272 lockdep_softirq_exit();
273 273
274 account_system_vtime(current); 274 vtime_account(current);
275 __local_bh_enable(SOFTIRQ_OFFSET); 275 __local_bh_enable(SOFTIRQ_OFFSET);
276 tsk_restore_flags(current, old_flags, PF_MEMALLOC); 276 tsk_restore_flags(current, old_flags, PF_MEMALLOC);
277} 277}
@@ -340,7 +340,7 @@ static inline void invoke_softirq(void)
340 */ 340 */
341void irq_exit(void) 341void irq_exit(void)
342{ 342{
343 account_system_vtime(current); 343 vtime_account(current);
344 trace_hardirq_exit(); 344 trace_hardirq_exit();
345 sub_preempt_count(IRQ_EXIT_OFFSET); 345 sub_preempt_count(IRQ_EXIT_OFFSET);
346 if (!in_interrupt() && local_softirq_pending()) 346 if (!in_interrupt() && local_softirq_pending())