diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-28 11:05:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-28 11:05:16 -0700 |
| commit | 187dd317f0169142e4adf6263852f93c3b6f6a3c (patch) | |
| tree | c539ad11655d4545c5ef4b54cbecd9cff9cff974 /kernel/timer.c | |
| parent | 9b71272b6ad4966481d73e6abf3ae4bbc3bdabd5 (diff) | |
| parent | 507e123151149e578c9aae33eb876c49824da5f8 (diff) | |
| download | blackbird-op-linux-187dd317f0169142e4adf6263852f93c3b6f6a3c.tar.gz blackbird-op-linux-187dd317f0169142e4adf6263852f93c3b6f6a3c.zip | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timer stats: Optimize by adding quick check to avoid function calls
timers: Fix timer_migration interface which accepts any number as input
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 54d3912f8cad..0b36b9e5cc8b 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -380,6 +380,8 @@ static void timer_stats_account_timer(struct timer_list *timer) { unsigned int flag = 0; + if (likely(!timer->start_site)) + return; if (unlikely(tbase_get_deferrable(timer->base))) flag |= TIMER_STATS_FLAG_DEFERRABLE; |
