From: Greg Kroah-Hartman Date: Tue, 3 Jan 2012 22:48:55 +0000 (-0800) Subject: remove rtc-expire-alarms-after-the-time-is-set.patch from 3.0 and 3.1 X-Git-Tag: v3.1.8~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77eecc36142278aad9f9341351ccdf652458376c;p=thirdparty%2Fkernel%2Fstable-queue.git remove rtc-expire-alarms-after-the-time-is-set.patch from 3.0 and 3.1 --- diff --git a/queue-3.0/rtc-expire-alarms-after-the-time-is-set.patch b/queue-3.0/rtc-expire-alarms-after-the-time-is-set.patch deleted file mode 100644 index 063cba6632a..00000000000 --- a/queue-3.0/rtc-expire-alarms-after-the-time-is-set.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 93b2ec0128c431148b216b8f7337c1a52131ef03 Mon Sep 17 00:00:00 2001 -From: NeilBrown -Date: Fri, 9 Dec 2011 09:39:15 +1100 -Subject: rtc: Expire alarms after the time is set. - -From: NeilBrown - -commit 93b2ec0128c431148b216b8f7337c1a52131ef03 upstream. - -If the alarm time programming in the rtc is ever in the past, it won't fire, -and any other alarm will be queued after it so they won't fire either. - -So any time that the alarm might be in the past, we need to trigger -the irq handler to ensure the old alarm is cleared and the timer queue -is fully in the future. - -This can happen: - - when we first initialise the alarm - - when we set the time in the rtc. - -so follow both of these by scheduling the timer work function. - -Signed-off-by: NeilBrown -[Also catch set_mmss case -jstultz] -Signed-off-by: John Stultz -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/rtc/interface.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/rtc/interface.c -+++ b/drivers/rtc/interface.c -@@ -72,6 +72,8 @@ int rtc_set_time(struct rtc_device *rtc, - err = -EINVAL; - - mutex_unlock(&rtc->ops_lock); -+ /* A timer might have just expired */ -+ schedule_work(&rtc->irqwork); - return err; - } - EXPORT_SYMBOL_GPL(rtc_set_time); -@@ -111,6 +113,8 @@ int rtc_set_mmss(struct rtc_device *rtc, - err = -EINVAL; - - mutex_unlock(&rtc->ops_lock); -+ /* A timer might have just expired */ -+ schedule_work(&rtc->irqwork); - - return err; - } -@@ -402,6 +406,8 @@ int rtc_initialize_alarm(struct rtc_devi - timerqueue_add(&rtc->timerqueue, &rtc->aie_timer.node); - } - mutex_unlock(&rtc->ops_lock); -+ /* maybe that was in the past.*/ -+ schedule_work(&rtc->irqwork); - return err; - } - EXPORT_SYMBOL_GPL(rtc_initialize_alarm); diff --git a/queue-3.0/series b/queue-3.0/series index c06308bb74b..b218a04325a 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -1,6 +1,5 @@ arm-omap-rx51-fix-usb.patch ipip-sit-copy-parms.name-after-register_netdevice.patch -rtc-expire-alarms-after-the-time-is-set.patch rtc-m41t80-workaround-broken-alarm-functionality.patch drm-i915-prevent-division-by-zero-when-asking-for-chipset-power.patch cfq-iosched-free-cic_index-if-blkio_alloc_blkg_stats-fails.patch diff --git a/queue-3.1/rtc-expire-alarms-after-the-time-is-set.patch b/queue-3.1/rtc-expire-alarms-after-the-time-is-set.patch deleted file mode 100644 index 063cba6632a..00000000000 --- a/queue-3.1/rtc-expire-alarms-after-the-time-is-set.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 93b2ec0128c431148b216b8f7337c1a52131ef03 Mon Sep 17 00:00:00 2001 -From: NeilBrown -Date: Fri, 9 Dec 2011 09:39:15 +1100 -Subject: rtc: Expire alarms after the time is set. - -From: NeilBrown - -commit 93b2ec0128c431148b216b8f7337c1a52131ef03 upstream. - -If the alarm time programming in the rtc is ever in the past, it won't fire, -and any other alarm will be queued after it so they won't fire either. - -So any time that the alarm might be in the past, we need to trigger -the irq handler to ensure the old alarm is cleared and the timer queue -is fully in the future. - -This can happen: - - when we first initialise the alarm - - when we set the time in the rtc. - -so follow both of these by scheduling the timer work function. - -Signed-off-by: NeilBrown -[Also catch set_mmss case -jstultz] -Signed-off-by: John Stultz -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/rtc/interface.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/rtc/interface.c -+++ b/drivers/rtc/interface.c -@@ -72,6 +72,8 @@ int rtc_set_time(struct rtc_device *rtc, - err = -EINVAL; - - mutex_unlock(&rtc->ops_lock); -+ /* A timer might have just expired */ -+ schedule_work(&rtc->irqwork); - return err; - } - EXPORT_SYMBOL_GPL(rtc_set_time); -@@ -111,6 +113,8 @@ int rtc_set_mmss(struct rtc_device *rtc, - err = -EINVAL; - - mutex_unlock(&rtc->ops_lock); -+ /* A timer might have just expired */ -+ schedule_work(&rtc->irqwork); - - return err; - } -@@ -402,6 +406,8 @@ int rtc_initialize_alarm(struct rtc_devi - timerqueue_add(&rtc->timerqueue, &rtc->aie_timer.node); - } - mutex_unlock(&rtc->ops_lock); -+ /* maybe that was in the past.*/ -+ schedule_work(&rtc->irqwork); - return err; - } - EXPORT_SYMBOL_GPL(rtc_initialize_alarm); diff --git a/queue-3.1/series b/queue-3.1/series index 727a12c58c0..cfd742243b1 100644 --- a/queue-3.1/series +++ b/queue-3.1/series @@ -1,6 +1,5 @@ arm-omap-rx51-fix-usb.patch ipip-sit-copy-parms.name-after-register_netdevice.patch -rtc-expire-alarms-after-the-time-is-set.patch rtc-m41t80-workaround-broken-alarm-functionality.patch alsa-hda-set-position-fix-to-lpib-for-an-atom-poulsbo-based-device.patch drm-i915-set-the-right-sdvo-transcoder-for-cpt.patch