timer fixes
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,
Ingo
------------------>
Marcelo Roberto Jimenez (1):
RTC: Prevents a division by zero in kernel code.
Peter Zijlstra (1):
lockdep, timer: Fix del_timer_sync() annotation
drivers/rtc/class.c | 1 + drivers/rtc/interface.c | 3 +++ kernel/timer.c | 6 +++++- 3 files changed, 9 insertions(+), 1 deletions(-)
drivers/rtc/class.c +1 -0
@@ -143,6 +143,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, rtc->id = id; rtc->ops = ops; rtc->owner = owner; + rtc->irq_freq =1 ; rtc->max_user_freq =64 ; rtc->dev.parent = dev; rtc->dev.class = rtc_class;
drivers/rtc/interface.c +3 -0
@@ -464,6 +464,9 @@ int rtc_irq_set_freq(struct rtc_device *rtc, struct rtc_task *task, int freq)int err =0 ;unsigned long flags; +if (freq <=0 ) +return -EINVAL ; +spin_lock_irqsave (&rtc->irq_task_lock, flags);if (rtc->irq_task !=NULL && task ==NULL ) err = -EBUSY ;
kernel/timer.c +5 -1
@@ -969,10 +969,14 @@ EXPORT_SYMBOL(try_to_del_timer_sync);int del_timer_sync (struct timer_list *timer) {#ifdef CONFIG_LOCKDEP +unsigned long flags; + +raw_local_irq_save (flags);local_bh_disable ();lock_map_acquire (&timer->lockdep_map);lock_map_release (&timer->lockdep_map); -local_bh_enable (); +_local_bh_enable (); +raw_local_irq_restore (flags);#endif /* * don't use it in hardirq context, because it