Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173150
b: refs/heads/master
c: 8629ea2
h: refs/heads/master
v: v3
  • Loading branch information
Feng Tang authored and Thomas Gleixner committed Nov 20, 2009
1 parent b4ed029 commit 55dadff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8747d793fc5c4d3e4decd41d55f6dc24498dd5f5
refs/heads/master: 8629ea2eaba8ca0de2e38ce1b4a825e16255976e
4 changes: 1 addition & 3 deletions trunk/include/linux/hrtimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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));
}

Expand Down

0 comments on commit 55dadff

Please sign in to comment.