tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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:
clocksource: Prevent NULL pointer dereference
timer: Avoid reading uninitialized data

Linus Torvalds c57c3743 5b26776b

+2 -2
+1 -1
kernel/time/clocksource.c
··· 513 513 * Check to make sure we don't switch to a non-highres capable 514 514 * clocksource if the tick code is in oneshot mode (highres or nohz) 515 515 */ 516 - if (tick_oneshot_mode_active() && 516 + if (tick_oneshot_mode_active() && ovr && 517 517 !(ovr->flags & CLOCK_SOURCE_VALID_FOR_HRES)) { 518 518 printk(KERN_WARNING "%s clocksource is not HRT compatible. " 519 519 "Cannot switch while in HRT/NOHZ mode\n", ovr->name);
+1 -1
kernel/timer.c
··· 714 714 * networking code - if the timer is re-modified 715 715 * to be the same thing then just return: 716 716 */ 717 - if (timer->expires == expires && timer_pending(timer)) 717 + if (timer_pending(timer) && timer->expires == expires) 718 718 return 1; 719 719 720 720 return __mod_timer(timer, expires, false, TIMER_NOT_PINNED);