This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / arm / mach-integrator / core.c

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index eb16dea..7f6df02 100644 (file)
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -24,8 +24,6 @@
 #include <asm/leds.h>
 #include <asm/mach/time.h>
 
-#include "common.h"
-
 static struct amba_device rtc_device = {
        .dev            = {
                .bus_id = "mb:15",
@@ -165,13 +163,15 @@ typedef struct TimerStruct {
        unsigned long TimerClear;
 } TimerStruct_t;
 
+extern unsigned long (*gettimeoffset)(void);
+
 static unsigned long timer_reload;
 
 /*
  * Returns number of ms since last clock interrupt.  Note that interrupts
  * will have been disabled by do_gettimeoffset()
  */
-unsigned long integrator_gettimeoffset(void)
+static unsigned long integrator_gettimeoffset(void)
 {
        volatile TimerStruct_t *timer1 = (TimerStruct_t *)TIMER1_VA_BASE;
        unsigned long ticks1, ticks2, status;
@@ -214,15 +214,11 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        volatile TimerStruct_t *timer1 = (volatile TimerStruct_t *)TIMER1_VA_BASE;
 
-       write_seqlock(&xtime_lock);
-
        // ...clear the interrupt
        timer1->TimerClear = 1;
 
        timer_tick(regs);
 
-       write_sequnlock(&xtime_lock);
-
        return IRQ_HANDLED;
 }
 
@@ -268,4 +264,5 @@ void __init integrator_time_init(unsigned long reload, unsigned int ctrl)
         * Make irqs happen for the system timer
         */
        setup_irq(IRQ_TIMERINT1, &integrator_timer_irq);
+       gettimeoffset = integrator_gettimeoffset;
 }