hrtimer: Fix /proc/timer_list regression
authorFeng Tang <feng.tang@intel.com>
Thu, 3 Sep 2009 08:32:53 +0000 (16:32 +0800)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 20 Nov 2009 10:25:48 +0000 (11:25 +0100)
commit8629ea2eaba8ca0de2e38ce1b4a825e16255976e
tree8a4f16c0cdd069c808993e4701ca45590b35c611
parent8747d793fc5c4d3e4decd41d55f6dc24498dd5f5
hrtimer: Fix /proc/timer_list regression

commit 507e1231 (timer stats: Optimize by adding quick check to avoid
function calls) introduced a regression in /proc/timer_list.

/proc/timer_list shows now
 #0: <c27d46b0>, tick_sched_timer, S:01, <(null)>, /-1
instead of
 #0: <c27d46b0>, tick_sched_timer, S:01, hrtimer_start, swapper/0

Revert the hrtimer quick check for now. The optimization needs more
thought, but this is neither 2.6.32-rc7 nor stable material.

[ tglx: - Removed unrelated changes from the original patch
   - Prevent unneccesary call to timer_stats_update_stats
- massaged the changelog ]

Signed-off-by: Feng Tang <feng.tang@intel.com>
LKML-Reference: <alpine.LFD.2.00.0911181933540.24119@localhost.localdomain>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: stable@kernel.org
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/linux/hrtimer.h