diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2012-11-13 12:21:22 -0500 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2012-11-19 10:40:16 -0500 |
commit | fd25b4c2f226de818e1d2b71e3e681d28bcaf5ba (patch) | |
tree | dd1ce241709d2363e0d8b2c853f51dc5c897805c /include/linux/vtime.h | |
parent | 38ca9c927c7d3db61f57e3d3a9334958c3af6e9a (diff) |
vtime: Remove the underscore prefix invasion
Prepending irq-unsafe vtime APIs with underscores was actually
a bad idea as the result is a big mess in the API namespace that
is even waiting to be further extended. Also these helpers
are always called from irq safe callers except kvm. Just
provide a vtime_account_system_irqsafe() for this specific
case so that we can remove the underscore prefix on other
vtime functions.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
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 'include/linux/vtime.h')
-rw-r--r-- | include/linux/vtime.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/vtime.h b/include/linux/vtime.h index 0c2a2d303020..5ad13c325deb 100644 --- a/include/linux/vtime.h +++ b/include/linux/vtime.h | |||
@@ -5,14 +5,14 @@ struct task_struct; | |||
5 | 5 | ||
6 | #ifdef CONFIG_VIRT_CPU_ACCOUNTING | 6 | #ifdef CONFIG_VIRT_CPU_ACCOUNTING |
7 | extern void vtime_task_switch(struct task_struct *prev); | 7 | extern void vtime_task_switch(struct task_struct *prev); |
8 | extern void __vtime_account_system(struct task_struct *tsk); | ||
9 | extern void vtime_account_system(struct task_struct *tsk); | 8 | extern void vtime_account_system(struct task_struct *tsk); |
10 | extern void __vtime_account_idle(struct task_struct *tsk); | 9 | extern void vtime_account_system_irqsafe(struct task_struct *tsk); |
10 | extern void vtime_account_idle(struct task_struct *tsk); | ||
11 | extern void vtime_account(struct task_struct *tsk); | 11 | extern void vtime_account(struct task_struct *tsk); |
12 | #else | 12 | #else |
13 | static inline void vtime_task_switch(struct task_struct *prev) { } | 13 | static inline void vtime_task_switch(struct task_struct *prev) { } |
14 | static inline void __vtime_account_system(struct task_struct *tsk) { } | ||
15 | static inline void vtime_account_system(struct task_struct *tsk) { } | 14 | static inline void vtime_account_system(struct task_struct *tsk) { } |
15 | static inline void vtime_account_system_irqsafe(struct task_struct *tsk) { } | ||
16 | static inline void vtime_account(struct task_struct *tsk) { } | 16 | static inline void vtime_account(struct task_struct *tsk) { } |
17 | #endif | 17 | #endif |
18 | 18 | ||
@@ -40,7 +40,7 @@ static inline void vtime_account_irq_enter(struct task_struct *tsk) | |||
40 | static inline void vtime_account_irq_exit(struct task_struct *tsk) | 40 | static inline void vtime_account_irq_exit(struct task_struct *tsk) |
41 | { | 41 | { |
42 | /* On hard|softirq exit we always account to hard|softirq cputime */ | 42 | /* On hard|softirq exit we always account to hard|softirq cputime */ |
43 | __vtime_account_system(tsk); | 43 | vtime_account_system(tsk); |
44 | irqtime_account_irq(tsk); | 44 | irqtime_account_irq(tsk); |
45 | } | 45 | } |
46 | 46 | ||