vserver 1.9.3

[linux-2.6.git] / arch / ia64 / sn / kernel / sn2 / timer.c

diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c
index 57844fe..85f7d21 100644 (file)
--- a/arch/ia64/sn/kernel/sn2/timer.c
+++ b/arch/ia64/sn/kernel/sn2/timer.c
@@ -20,57 +20,16 @@
 
 
 extern unsigned long sn_rtc_cycles_per_second;
-static volatile unsigned long last_wall_rtc;
 
-static unsigned long rtc_offset;       /* updated only when xtime write-lock is held! */
-static long rtc_nsecs_per_cycle;
-static long rtc_per_timer_tick;
-
-static unsigned long
-getoffset(void)
-{
-       return rtc_offset + (GET_RTC_COUNTER() - last_wall_rtc)*rtc_nsecs_per_cycle;
-}
-
-
-static void
-update(long delta_nsec)
-{
-       unsigned long rtc_counter = GET_RTC_COUNTER();
-       unsigned long offset = rtc_offset + (rtc_counter - last_wall_rtc)*rtc_nsecs_per_cycle;
-
-       /* Be careful about signed/unsigned comparisons here: */
-       if (delta_nsec < 0 || (unsigned long) delta_nsec < offset)
-               rtc_offset = offset - delta_nsec;
-       else
-               rtc_offset = 0;
-       last_wall_rtc = rtc_counter;
-}
-
-
-static void
-reset(void)
-{
-       rtc_offset = 0;
-       last_wall_rtc = GET_RTC_COUNTER();
-}
-
-
-static struct time_interpolator sn2_interpolator = {
-       .get_offset =   getoffset,
-       .update =       update,
-       .reset =        reset
-};
+static struct time_interpolator sn2_interpolator;
 
 void __init
 sn_timer_init(void)
 {
        sn2_interpolator.frequency = sn_rtc_cycles_per_second;
        sn2_interpolator.drift = -1;    /* unknown */
+       sn2_interpolator.shift = 10;    /* RTC is 54 bits maximum shift is 10 */
+       sn2_interpolator.addr = RTC_COUNTER_ADDR;
+       sn2_interpolator.source = TIME_SOURCE_MMIO64;
        register_time_interpolator(&sn2_interpolator);
-
-       rtc_per_timer_tick = sn_rtc_cycles_per_second / HZ;
-       rtc_nsecs_per_cycle = 1000000000 / sn_rtc_cycles_per_second;
-
-       last_wall_rtc = GET_RTC_COUNTER();
 }