Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / arm / mach-imx / time.c

diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c
index ac7cab9..ea805bf 100644 (file)
--- a/arch/arm/mach-imx/time.c
+++ b/arch/arm/mach-imx/time.c
@@ -28,8 +28,7 @@
  * Returns number of us since last clock interrupt.  Note that interrupts
  * will have been disabled by do_gettimeoffset()
  */
-static unsigned long
-imx_gettimeoffset(void)
+static unsigned long imx_gettimeoffset(void)
 {
        unsigned long ticks;
 
@@ -59,25 +58,28 @@ imx_gettimeoffset(void)
 static irqreturn_t
 imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
+       write_seqlock(&xtime_lock);
+
        /* clear the interrupt */
        if (IMX_TSTAT(TIMER_BASE))
                IMX_TSTAT(TIMER_BASE) = 0;
 
        timer_tick(regs);
+       write_sequnlock(&xtime_lock);
+
        return IRQ_HANDLED;
 }
 
 static struct irqaction imx_timer_irq = {
        .name           = "i.MX Timer Tick",
-       .flags          = SA_INTERRUPT,
-       .handler        = imx_timer_interrupt
+       .flags          = SA_INTERRUPT | SA_TIMER,
+       .handler        = imx_timer_interrupt,
 };
 
 /*
  * Set up timer interrupt, and return the current time in seconds.
  */
-void __init
-imx_init_time(void)
+static void __init imx_timer_init(void)
 {
        /*
         * Initialise to a known state (all timers off, and timing reset)
@@ -91,5 +93,9 @@ imx_init_time(void)
         * Make irqs happen for the system timer
         */
        setup_irq(TIM1_INT, &imx_timer_irq);
-       gettimeoffset = imx_gettimeoffset;
 }
+
+struct sys_timer imx_timer = {
+       .init           = imx_timer_init,
+       .offset         = imx_gettimeoffset,
+};