3 files changed, 86 insertions, 0 deletions

diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index 3d16decc15cf..8d28cee0dec0 100644
--- a/arch/x86/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
@@ -656,10 +656,13 @@ fastcall void smp_reschedule_interrupt(struct pt_regs *regs)
         TS_SEND_RESCHED_END;
 }
 
+extern void hrtimer_pull(void);
+
 fastcall void smp_pull_timers_interrupt(struct pt_regs *regs)
 {
         ack_APIC_irq();
         TRACE("pull timers interrupt\n");
+        hrtimer_pull();
 }
 
 fastcall void smp_call_function_interrupt(struct pt_regs *regs)
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 7a9398e19704..32d456e01da0 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -200,6 +200,18 @@ struct hrtimer_cpu_base {
         struct list_head                cb_pending;
         unsigned long                   nr_events;
 #endif
+        struct list_head                to_pull;
+};
+
+#define HRTIMER_START_ON_INACTIVE       0
+#define HRTIMER_START_ON_QUEUED         1
+
+struct hrtimer_start_on_info {
+        struct list_head        list;
+        struct hrtimer*         timer;
+        ktime_t                 time;
+        enum hrtimer_mode       mode;
+        atomic_t                state;
 };
 
 #ifdef CONFIG_HIGH_RES_TIMERS
@@ -262,6 +274,9 @@ extern void hrtimer_init(struct hrtimer *timer, clockid_t which_clock,
 /* Basic timer operations: */
 extern int hrtimer_start(struct hrtimer *timer, ktime_t tim,
                          const enum hrtimer_mode mode);
+extern int hrtimer_start_on(int cpu, struct hrtimer_start_on_info* info,
+                            struct hrtimer *timer, ktime_t time,
+                            const enum hrtimer_mode mode);
 extern int hrtimer_cancel(struct hrtimer *timer);
 extern int hrtimer_try_to_cancel(struct hrtimer *timer);
 
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f994bb8065e6..3165b4810106 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -46,6 +46,9 @@
 
 #include <asm/uaccess.h>
 
+#include <litmus/litmus.h>
+
+
 /**
  * ktime_get - get the monotonic time in ktime_t format
  *
@@ -813,6 +816,70 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base)
         return 0;
 }
 
+void hrtimer_pull(void)
+{
+        struct hrtimer_cpu_base* base = &__get_cpu_var(hrtimer_bases);
+        struct hrtimer_start_on_info* info;
+        struct list_head *pos, *safe, list;
+
+        spin_lock(&base->lock);
+        list_replace_init(&base->to_pull, &list);
+        spin_unlock(&base->lock);
+
+        list_for_each_safe(pos, safe, &list) {
+                info = list_entry(pos, struct hrtimer_start_on_info, list);
+                TRACE("pulled timer 0x%x\n", info->timer);
+                list_del(pos);
+                hrtimer_start(info->timer, info->time, info->mode);
+        }
+}
+
+int hrtimer_start_on(int cpu, struct hrtimer_start_on_info* info,
+                     struct hrtimer *timer, ktime_t time,
+                     const enum hrtimer_mode mode)
+{
+        unsigned long flags;
+        struct hrtimer_cpu_base* base;
+        int in_use = 0, was_empty;
+
+        /* serialize access to info through the timer base */
+        lock_hrtimer_base(timer, &flags);
+
+        in_use = atomic_read(&info->state) != HRTIMER_START_ON_INACTIVE;
+        if (!in_use) {
+                INIT_LIST_HEAD(&info->list);
+                info->timer = timer;
+                info->time  = time;
+                info->mode  = mode;
+                /* mark as in use */
+                atomic_set(&info->state, HRTIMER_START_ON_QUEUED);
+        }
+
+        unlock_hrtimer_base(timer, &flags);
+
+        if (!in_use) {
+                /* initiate pull  */
+                preempt_disable();
+                if (cpu == smp_processor_id()) {
+                        /* start timer locally */
+                        hrtimer_start(info->timer, info->time, info->mode);
+                } else {
+                        base = &per_cpu(hrtimer_bases, cpu);
+                        spin_lock_irqsave(&base->lock, flags);
+                        was_empty = list_empty(&base->to_pull);
+                        list_add(&info->list, &base->to_pull);
+                        spin_unlock_irqrestore(&base->lock, flags);
+                        if (was_empty)
+                                /* only send IPI if other no else
+                                 * has done so already
+                                 */
+                                smp_send_pull_timers(cpu);
+                }
+                preempt_enable();
+        }
+        return in_use;
+}
+
 /**
  * hrtimer_start - (re)start an relative timer on the current CPU
  * @timer:      the timer to be added
@@ -1390,6 +1457,7 @@ static void __cpuinit init_hrtimers_cpu(int cpu)
                 cpu_base->clock_base[i].cpu_base = cpu_base;
 
         hrtimer_init_hres(cpu_base);
+        INIT_LIST_HEAD(&cpu_base->to_pull);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU