git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
arm
/
common
/
time-acorn.c
diff --git
a/arch/arm/common/time-acorn.c
b/arch/arm/common/time-acorn.c
index
486add8
..
34038ec
100644
(file)
--- a/
arch/arm/common/time-acorn.c
+++ b/
arch/arm/common/time-acorn.c
@@
-16,6
+16,7
@@
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/hardware.h>
#include <asm/io.h>
@@
-66,17
+67,17
@@
void __init ioctime_init(void)
}
static irqreturn_t
}
static irqreturn_t
-ioc_timer_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+ioc_timer_interrupt(int irq, void *dev_id)
{
write_seqlock(&xtime_lock);
{
write_seqlock(&xtime_lock);
- timer_tick(
regs
);
+ timer_tick();
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
}
static struct irqaction ioc_timer_irq = {
.name = "timer",
write_sequnlock(&xtime_lock);
return IRQ_HANDLED;
}
static struct irqaction ioc_timer_irq = {
.name = "timer",
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.handler = ioc_timer_interrupt
};
.handler = ioc_timer_interrupt
};