Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers

2 files changed, 41 insertions, 2 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 4cd5b4319b04..8af10027514b 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1296,10 +1296,14 @@ static int futex_wait(u32 __user *uaddr, struct rw_semaphore *fshared,
                 if (!abs_time)
                         schedule();
                 else {
+                        unsigned long slack;
+                        slack = current->timer_slack_ns;
+                        if (rt_task(current))
+                                slack = 0;
                         hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC,
                                                 HRTIMER_MODE_ABS);
                         hrtimer_init_sleeper(&t, current);
-                        hrtimer_set_expires(&t.timer, *abs_time);
+                        hrtimer_set_expires_range_ns(&t.timer, *abs_time, slack);
 
                         hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS);
                         if (!hrtimer_active(&t.timer))
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index a0222097c57e..eb2cf984959f 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1381,6 +1381,36 @@ void hrtimer_interrupt(struct clock_event_device *dev)
                 raise_softirq(HRTIMER_SOFTIRQ);
 }
 
+/**
+ * hrtimer_peek_ahead_timers -- run soft-expired timers now
+ *
+ * hrtimer_peek_ahead_timers will peek at the timer queue of
+ * the current cpu and check if there are any timers for which
+ * the soft expires time has passed. If any such timers exist,
+ * they are run immediately and then removed from the timer queue.
+ *
+ */
+void hrtimer_peek_ahead_timers(void)
+{
+        unsigned long flags;
+        struct tick_device *td;
+        struct clock_event_device *dev;
+
+        if (hrtimer_hres_active())
+                return;
+
+        local_irq_save(flags);
+        td = &__get_cpu_var(tick_cpu_device);
+        if (!td)
+                goto out;
+        dev = td->evtdev;
+        if (!dev)
+                goto out;
+        hrtimer_interrupt(dev);
+out:
+        local_irq_restore(flags);
+}
+
 static void run_hrtimer_softirq(struct softirq_action *h)
 {
         run_hrtimer_pending(&__get_cpu_var(hrtimer_bases));
@@ -1563,9 +1593,14 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
         struct restart_block *restart;
         struct hrtimer_sleeper t;
         int ret = 0;
+        unsigned long slack;
+
+        slack = current->timer_slack_ns;
+        if (rt_task(current))
+                slack = 0;
 
         hrtimer_init_on_stack(&t.timer, clockid, mode);
-        hrtimer_set_expires(&t.timer, timespec_to_ktime(*rqtp));
+        hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack);
         if (do_nanosleep(&t, mode))
                 goto out;