git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp2000
/
core.c
diff --git
a/arch/arm/mach-ixp2000/core.c
b/arch/arm/mach-ixp2000/core.c
index
cb6ad21
..
81cdc82
100644
(file)
--- a/
arch/arm/mach-ixp2000/core.c
+++ b/
arch/arm/mach-ixp2000/core.c
@@
-206,8
+206,6
@@
unsigned long ixp2000_gettimeoffset (void)
static int ixp2000_timer_interrupt(int irq, void *dev_id)
{
- write_seqlock(&xtime_lock);
-
/* clear timer 1 */
ixp2000_reg_wrb(IXP2000_T1_CLR, 1);
@@
-217,8
+215,6
@@
static int ixp2000_timer_interrupt(int irq, void *dev_id)
next_jiffy_time -= ticks_per_jiffy;
}
- write_sequnlock(&xtime_lock);
-
return IRQ_HANDLED;
}