summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds2009-07-16 19:07:37 +0200
committerLinus Torvalds2009-07-16 19:07:37 +0200
commit63f7a330014ad29b662638caabd8e96fe945b9ed (patch)
tree4a866e63fee62d3f36ca430bbdd5adf5bb75e82b /include
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
parenttimer stats: fix quick check optimization (diff)
downloadkernel-qcow2-linux-63f7a330014ad29b662638caabd8e96fe945b9ed.tar.gz
kernel-qcow2-linux-63f7a330014ad29b662638caabd8e96fe945b9ed.tar.xz
kernel-qcow2-linux-63f7a330014ad29b662638caabd8e96fe945b9ed.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: fix quick check optimization
Diffstat (limited to 'include')
-rw-r--r--include/linux/hrtimer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 54648e625efd..4759917adc71 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -448,7 +448,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_pid))
+ if (likely(!timer->start_site))
return;
timer_stats_update_stats(timer, timer->start_pid, timer->start_site,
timer->function, timer->start_comm, 0);