Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource

Conflicts:
	arch/ia64/kernel/cyclone.c
	arch/mips/kernel/i8253.c
	arch/x86/kernel/i8253.c

Reason: Resolve conflicts so further cleanups do not conflict further

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index c404b61386bf..39013867cbd6 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -117,6 +117,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
                                         struct module *owner)
 {
         struct rtc_device *rtc;
+        struct rtc_wkalrm alrm;
         int id, err;
 
         if (idr_pre_get(&rtc_idr, GFP_KERNEL) == 0) {
@@ -166,6 +167,12 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
         rtc->pie_timer.function = rtc_pie_update_irq;
         rtc->pie_enabled = 0;
 
+        /* Check to see if there is an ALARM already set in hw */
+        err = __rtc_read_alarm(rtc, &alrm);
+
+        if (!err && !rtc_valid_tm(&alrm.time))
+                rtc_initialize_alarm(rtc, &alrm);
+
         strlcpy(rtc->name, name, RTC_DEVICE_NAME_SIZE);
         dev_set_name(&rtc->dev, "rtc%d", id);