From 55dadff92a797efa2567c1f383e71d5a38274261 Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Thu, 3 Sep 2009 16:32:53 +0800 Subject: [PATCH] --- yaml --- r: 173150 b: refs/heads/master c: 8629ea2eaba8ca0de2e38ce1b4a825e16255976e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/hrtimer.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1ceace357272..7ba8b0b8f6c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8747d793fc5c4d3e4decd41d55f6dc24498dd5f5 +refs/heads/master: 8629ea2eaba8ca0de2e38ce1b4a825e16255976e diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index ff037f0b1b4e..9bace4b9f4fe 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/include/linux/hrtimer.h @@ -446,7 +446,7 @@ extern void timer_stats_update_stats(void *timer, pid_t pid, void *startf, static inline void timer_stats_account_hrtimer(struct hrtimer *timer) { - if (likely(!timer->start_site)) + if (likely(!timer_stats_active)) return; timer_stats_update_stats(timer, timer->start_pid, timer->start_site, timer->function, timer->start_comm, 0); @@ -457,8 +457,6 @@ extern void __timer_stats_hrtimer_set_start_info(struct hrtimer *timer, static inline void timer_stats_hrtimer_set_start_info(struct hrtimer *timer) { - if (likely(!timer_stats_active)) - return; __timer_stats_hrtimer_set_start_info(timer, __builtin_return_address(0)); }