Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63f7a330 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-fixes-for-linus' of... 

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
parents a132ebcb f9f868db

include/linux/hrtimer.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

static inline void timer_stats_account_hrtimer(struct hrtimer *timer)

{

{

	if (likely(!timer->start_pid))

	if (likely(!timer->start_site))

		return;

		return;

	timer_stats_update_stats(timer, timer->start_pid, timer->start_site,

	timer_stats_update_stats(timer, timer->start_pid, timer->start_site,

				 timer->function, timer->start_comm, 0);

				 timer->function, timer->start_comm, 0);