x86-32: add support for smp_send_pull_timers()

This establishes the architectures dependent bits for hrtimer_start_on()
on x86-32.

5 files changed, 23 insertions, 0 deletions

diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index 1063dfc498..e1c5aa316f 100644
--- a/arch/x86/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
@@ -25,6 +25,8 @@
 #include <asm/mmu_context.h>
 #include <mach_apic.h>
 
+#include <litmus/litmus.h>
+
 /*
  *      Some notes on x86 processor bugs affecting SMP operation:
  *
@@ -475,6 +477,12 @@ static void native_smp_send_reschedule(int cpu)
         send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
 }
 
+void smp_send_pull_timers(int cpu)
+{
+        WARN_ON(cpu_is_offline(cpu));
+        send_IPI_mask(cpumask_of_cpu(cpu), PULL_TIMERS_VECTOR);
+}
+
 /*
  * Structure and data for smp_call_function(). This is designed to minimise
  * static memory requirements. It also looks cleaner.
@@ -645,6 +653,15 @@ fastcall void smp_reschedule_interrupt(struct pt_regs *regs)
         __get_cpu_var(irq_stat).irq_resched_count++;
 }
 
+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)
 {
         void (*func) (void *info) = call_data->func;
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 4ea80cbe52..133cbb6118 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -1323,6 +1323,8 @@ void __init smp_intr_init(void)
 
         /* IPI for generic function call */
         set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);
+
+        set_intr_gate(PULL_TIMERS_VECTOR, pull_timers_interrupt);
 }
 
 /*
diff --git a/include/asm-x86/hw_irq_32.h b/include/asm-x86/hw_irq_32.h
index 0bedbdf5e9..d5d7c67697 100644
--- a/include/asm-x86/hw_irq_32.h
+++ b/include/asm-x86/hw_irq_32.h
@@ -32,6 +32,7 @@ extern void (*interrupt[NR_IRQS])(void);
 fastcall void reschedule_interrupt(void);
 fastcall void invalidate_interrupt(void);
 fastcall void call_function_interrupt(void);
+fastcall void pull_timers_interrupt(void);
 #endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
diff --git a/include/asm-x86/mach-default/entry_arch.h b/include/asm-x86/mach-default/entry_arch.h
index bc861469bd..f76a08618d 100644
--- a/include/asm-x86/mach-default/entry_arch.h
+++ b/include/asm-x86/mach-default/entry_arch.h
@@ -13,6 +13,7 @@
 BUILD_INTERRUPT(reschedule_interrupt,RESCHEDULE_VECTOR)
 BUILD_INTERRUPT(invalidate_interrupt,INVALIDATE_TLB_VECTOR)
 BUILD_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR)
+BUILD_INTERRUPT(pull_timers_interrupt,PULL_TIMERS_VECTOR)
 #endif
 
 /*
diff --git a/include/asm-x86/mach-default/irq_vectors.h b/include/asm-x86/mach-default/irq_vectors.h
index 881c63ca61..fd42e2a40c 100644
--- a/include/asm-x86/mach-default/irq_vectors.h
+++ b/include/asm-x86/mach-default/irq_vectors.h
@@ -49,6 +49,8 @@
 #define RESCHEDULE_VECTOR       0xfc
 #define CALL_FUNCTION_VECTOR    0xfb
 
+#define PULL_TIMERS_VECTOR      0xfa /* LITMUS hrtimer hack */
+
 #define THERMAL_APIC_VECTOR     0xf0
 /*
  * Local APIC timer IRQ vector is on a different priority level,