Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into...

[pandora-kernel.git] / arch / alpha / kernel / time.c

diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 33b8110..818e74e 100644 (file)
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -153,13 +153,14 @@ void read_persistent_clock(struct timespec *ts)
                year += 100;
 
        ts->tv_sec = mktime(year, mon, day, hour, min, sec);
+       ts->tv_nsec = 0;
 }
 
 
 
 /*
  * timer_interrupt() needs to keep up the real-time clock,
- * as well as call the "do_timer()" routine every clocktick
+ * as well as call the "xtime_update()" routine every clocktick
  */
 irqreturn_t timer_interrupt(int irq, void *dev)
 {
@@ -172,8 +173,6 @@ irqreturn_t timer_interrupt(int irq, void *dev)
        profile_tick(CPU_PROFILING);
 #endif
 
-       write_seqlock(&xtime_lock);
-
        /*
         * Calculate how many ticks have passed since the last update,
         * including any previous partial leftover.  Save any resulting
@@ -187,9 +186,7 @@ irqreturn_t timer_interrupt(int irq, void *dev)
        nticks = delta >> FIX_SHIFT;
 
        if (nticks)
-               do_timer(nticks);
-
-       write_sequnlock(&xtime_lock);
+               xtime_update(nticks);
 
        if (test_irq_work_pending()) {
                clear_irq_work_pending();