Messages in this thread Patch in this message |  | | | From | Yong Zhang <> | | Subject | [RFC PATCH 3/6] timer: move timer_stats_timer_*_start_info() to kernel/timer.c | | Date | Sun, 29 Aug 2010 23:05:06 +0800 |
| |
From: Yong Zhang <yong.zhang@windriver.com>
timer_stats_timer_*_start_info() should not be seen outside, move it to where it should be.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Ingo Molnar <mingo@elte.hu> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> --- include/linux/timer.h | 23 ----------------------- kernel/timer.c | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/include/linux/timer.h b/include/linux/timer.h index 38cf093..4fb4cd7 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -217,33 +217,10 @@ extern void init_timer_stats(void); extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf, void *timerf, char *comm, unsigned int timer_flag); - -extern void __timer_stats_timer_set_start_info(struct timer_list *timer, - void *addr); - -static inline void timer_stats_timer_set_start_info(struct timer_list *timer) -{ - if (likely(!timer_stats_active)) - return; - __timer_stats_timer_set_start_info(timer, __builtin_return_address(0)); -} - -static inline void timer_stats_timer_clear_start_info(struct timer_list *timer) -{ - timer->start_site = NULL; -} #else static inline void init_timer_stats(void) { } - -static inline void timer_stats_timer_set_start_info(struct timer_list *timer) -{ -} - -static inline void timer_stats_timer_clear_start_info(struct timer_list *timer) -{ -} #endif extern void add_timer(struct timer_list *timer); diff --git a/kernel/timer.c b/kernel/timer.c index 2a443cc..6dd3a9e 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -395,16 +395,24 @@ static void internal_add_timer(struct tvec_base *base, struct timer_list *timer) } #ifdef CONFIG_TIMER_STATS -void __timer_stats_timer_set_start_info(struct timer_list *timer, void *addr) +static inline void timer_stats_timer_set_start_info(struct timer_list *timer) { + if (likely(!timer_stats_active)) + return; + if (timer->start_site) return; - timer->start_site = addr; + timer->start_site = __builtin_return_address(0); memcpy(timer->start_comm, current->comm, TASK_COMM_LEN); timer->start_pid = current->pid; } +static inline void timer_stats_timer_clear_start_info(struct timer_list *timer) +{ + timer->start_site = NULL; +} + static void timer_stats_account_timer(struct timer_list *timer) { unsigned int flag = 0; @@ -419,6 +427,14 @@ static void timer_stats_account_timer(struct timer_list *timer) } #else +static inline void timer_stats_timer_set_start_info(struct timer_list *timer) +{ +} + +static inline void timer_stats_timer_clear_start_info(struct timer_list *timer) +{ +} + static void timer_stats_account_timer(struct timer_list *timer) {} #endif -- 1.7.0.4
|  |