timer fixes for 2.6.31
Linus,
Please pull the latest timers-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus
Thanks,
tglx
------------------>
Pavel Roskin (1):
timer: Avoid reading uninitialized data
Thomas Gleixner (1):
clocksource: Prevent NULL pointer dereference
kernel/time/clocksource.c | 2 +- kernel/timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kernel/time/clocksource.c +1 -1
@@ -513,7 +513,7 @@ static ssize_t sysfs_override_clocksource(struct sys_device *dev,* Check to make sure we don't switch to a non-highres capable * clocksource if the tick code is in oneshot mode (highres or nohz) */ -if (tick_oneshot_mode_active () && +if (tick_oneshot_mode_active () && ovr && !(ovr->flags &CLOCK_SOURCE_VALID_FOR_HRES )) {printk (KERN_WARNING "%s clocksource is not HRT compatible. " "Cannot switch while in HRT/NOHZ mode\n" , ovr->name);
kernel/timer.c +1 -1
@@ -714,7 +714,7 @@ int mod_timer(struct timer_list *timer, unsigned long expires)* networking code - if the timer is re-modified * to be the same thing then just return: */ -if (timer->expires == expires &&timer_pending (timer)) +if (timer_pending (timer) && timer->expires == expires)return 1 ;return __mod_timer (timer, expires, false,TIMER_NOT_PINNED );