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:
lockdep, timer: Fix del_timer_sync() annotation
RTC: Prevents a division by zero in kernel code.

Linus Torvalds f0adc820 43a72328

+9 -1
+1
drivers/rtc/class.c
··· 143 143 rtc->id = id; 144 144 rtc->ops = ops; 145 145 rtc->owner = owner; 146 + rtc->irq_freq = 1; 146 147 rtc->max_user_freq = 64; 147 148 rtc->dev.parent = dev; 148 149 rtc->dev.class = rtc_class;
+3
drivers/rtc/interface.c
··· 464 464 int err = 0; 465 465 unsigned long flags; 466 466 467 + if (freq <= 0) 468 + return -EINVAL; 469 + 467 470 spin_lock_irqsave(&rtc->irq_task_lock, flags); 468 471 if (rtc->irq_task != NULL && task == NULL) 469 472 err = -EBUSY;
+5 -1
kernel/timer.c
··· 969 969 int del_timer_sync(struct timer_list *timer) 970 970 { 971 971 #ifdef CONFIG_LOCKDEP 972 + unsigned long flags; 973 + 974 + raw_local_irq_save(flags); 972 975 local_bh_disable(); 973 976 lock_map_acquire(&timer->lockdep_map); 974 977 lock_map_release(&timer->lockdep_map); 975 - local_bh_enable(); 978 + _local_bh_enable(); 979 + raw_local_irq_restore(flags); 976 980 #endif 977 981 /* 978 982 * don't use it in hardirq context, because it