ipsec: Fix deadlock in xfrm_state management.

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

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index e9c82deb791d30beb1a99aa043072329361c793c..8bacf6d4d0974eb4a3265e8ebab0ee11529d3022 100644 (file)
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -20,11 +20,11 @@
 #include <linux/amba/bus.h>
 #include <linux/amba/serial.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/hardware/arm_timer.h>
-#include <asm/arch/cm.h>
+#include <mach/cm.h>
 #include <asm/system.h>
 #include <asm/leds.h>
 #include <asm/mach/time.h>
@@ -250,8 +250,6 @@ unsigned long integrator_gettimeoffset(void)
 static irqreturn_t
 integrator_timer_interrupt(int irq, void *dev_id)
 {
-       write_seqlock(&xtime_lock);
-
        /*
         * clear the interrupt
         */
@@ -259,8 +257,6 @@ integrator_timer_interrupt(int irq, void *dev_id)
 
        timer_tick();
 
-       write_sequnlock(&xtime_lock);
-
        return IRQ_HANDLED;
 }