3 files changed, 37 insertions, 12 deletions

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 9265014cb4db..2d966244ea60 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -494,7 +494,7 @@ static int update_rmtp(ktime_t exp, enum  alarmtimer_type type,
  */
 static long __sched alarm_timer_nsleep_restart(struct restart_block *restart)
 {
-        enum  alarmtimer_type type = restart->nanosleep.index;
+        enum  alarmtimer_type type = restart->nanosleep.clockid;
         ktime_t exp;
         struct timespec __user  *rmtp;
         struct alarm alarm;
@@ -573,7 +573,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
 
         restart = &current_thread_info()->restart_block;
         restart->fn = alarm_timer_nsleep_restart;
-        restart->nanosleep.index = type;
+        restart->nanosleep.clockid = type;
         restart->nanosleep.expires = exp.tv64;
         restart->nanosleep.rmtp = rmtp;
         ret = -ERESTART_RESTARTBLOCK;
@@ -669,12 +669,20 @@ static int __init has_wakealarm(struct device *dev, void *name_ptr)
  */
 static int __init alarmtimer_init_late(void)
 {
+        struct device *dev;
         char *str;
 
         /* Find an rtc device and init the rtc_timer */
-        class_find_device(rtc_class, NULL, &str, has_wakealarm);
-        if (str)
+        dev = class_find_device(rtc_class, NULL, &str, has_wakealarm);
+        /* If we have a device then str is valid. See has_wakealarm() */
+        if (dev) {
                 rtcdev = rtc_class_open(str);
+                /*
+                 * Drop the reference we got in class_find_device,
+                 * rtc_open takes its own.
+                 */
+                put_device(dev);
+        }
         if (!rtcdev) {
                 printk(KERN_WARNING "No RTC device found, ALARM timers will"
                         " not wake from suspend");
diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 723c7637e55a..c7218d132738 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -456,23 +456,27 @@ void tick_broadcast_oneshot_control(unsigned long reason)
         unsigned long flags;
         int cpu;
 
-        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
-
         /*
          * Periodic mode does not care about the enter/exit of power
          * states
          */
         if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC)
-                goto out;
+                return;
 
-        bc = tick_broadcast_device.evtdev;
+        /*
+         * We are called with preemtion disabled from the depth of the
+         * idle code, so we can't be moved away.
+         */
         cpu = smp_processor_id();
         td = &per_cpu(tick_cpu_device, cpu);
         dev = td->evtdev;
 
         if (!(dev->features & CLOCK_EVT_FEAT_C3STOP))
-                goto out;
+                return;
+
+        bc = tick_broadcast_device.evtdev;
 
+        raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
         if (reason == CLOCK_EVT_NOTIFY_BROADCAST_ENTER) {
                 if (!cpumask_test_cpu(cpu, tick_get_broadcast_oneshot_mask())) {
                         cpumask_set_cpu(cpu, tick_get_broadcast_oneshot_mask());
@@ -489,8 +493,6 @@ void tick_broadcast_oneshot_control(unsigned long reason)
                                 tick_program_event(dev->next_event, 1);
                 }
         }
-
-out:
         raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }
 
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 8e6a05a5915a..342408cf68dd 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -680,7 +680,7 @@ static void timekeeping_resume(void)
         clockevents_notify(CLOCK_EVT_NOTIFY_RESUME, NULL);
 
         /* Resume hrtimers */
-        hres_timers_resume();
+        hrtimers_resume();
 }
 
 static int timekeeping_suspend(void)
@@ -1099,6 +1099,21 @@ void get_xtime_and_monotonic_and_sleep_offset(struct timespec *xtim,
 }
 
 /**
+ * ktime_get_monotonic_offset() - get wall_to_monotonic in ktime_t format
+ */
+ktime_t ktime_get_monotonic_offset(void)
+{
+        unsigned long seq;
+        struct timespec wtom;
+
+        do {
+                seq = read_seqbegin(&xtime_lock);
+                wtom = wall_to_monotonic;
+        } while (read_seqretry(&xtime_lock, seq));
+        return timespec_to_ktime(wtom);
+}
+
+/**
  * xtime_update() - advances the timekeeping infrastructure
  * @ticks:      number of ticks, that have elapsed since the last call.
  *