Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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:
rtc: Limit RTC PIE frequency
rtc: Fix hrtimer deadlock
rtc: Handle errors correctly in rtc_irq_set_state()
Fixup trivial conflicts in drivers/rtc/interface.c due to slightly
trivially versions of the same patch coming in two different ways.
+5
-2
+2
-2
drivers/rtc/interface.c
+2
-2
drivers/rtc/interface.c
···
639
639
static int rtc_update_hrtimer(struct rtc_device *rtc, int enabled)
640
640
{
641
641
/*
642
-
* We unconditionally cancel the timer here, because otherwise
642
+
* We always cancel the timer here first, because otherwise
643
643
* we could run into BUG_ON(timer->state != HRTIMER_STATE_CALLBACK);
644
644
* when we manage to start the timer before the callback
645
645
* returns HRTIMER_RESTART.
···
708
708
int err = 0;
709
709
unsigned long flags;
710
710
711
-
if (freq <= 0 || freq > 5000)
711
+
if (freq <= 0 || freq > RTC_MAX_FREQ)
712
712
return -EINVAL;
713
713
retry:
714
714
spin_lock_irqsave(&rtc->irq_task_lock, flags);