diff options
| author | Russell King | 2005-06-26 18:06:36 +0200 |
|---|---|---|
| committer | Russell King | 2005-06-26 18:06:36 +0200 |
| commit | 09b8b5f843afc21daf710cc610e5ca890ee94696 (patch) | |
| tree | ca6c4e4555e448ebfa884ee3ba8e8a7ae6bc35f7 /arch/arm/mach-sa1100 | |
| parent | Fix up try_to_freeze() usage in arch/i386/kernel/signal.c (diff) | |
| download | kernel-qcow2-linux-09b8b5f843afc21daf710cc610e5ca890ee94696.tar.gz kernel-qcow2-linux-09b8b5f843afc21daf710cc610e5ca890ee94696.tar.xz kernel-qcow2-linux-09b8b5f843afc21daf710cc610e5ca890ee94696.zip | |
[PATCH] ARM: Add SA_TIMER flag to timer interrupts
VST needs to know which timer handler is for the timer interrupt.
Mark all timer interrupts with the SA_TIMER flag.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/time.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 84c86543501a..65dbe991426d 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c @@ -727,7 +727,7 @@ static void h3800_IRQ_demux(unsigned int irq, struct irqdesc *desc, struct pt_re static struct irqaction h3800_irq = { .name = "h3800_asic", .handler = h3800_IRQ_demux, - .flags = SA_INTERRUPT, + .flags = SA_INTERRUPT | SA_TIMER, }; u32 kpio_int_shadow = 0; diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c index 19b0c0fd6377..0eeb3616ffea 100644 --- a/arch/arm/mach-sa1100/time.c +++ b/arch/arm/mach-sa1100/time.c @@ -99,8 +99,8 @@ sa1100_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) static struct irqaction sa1100_timer_irq = { .name = "SA11xx Timer Tick", - .flags = SA_INTERRUPT, - .handler = sa1100_timer_interrupt + .flags = SA_INTERRUPT | SA_TIMER, + .handler = sa1100_timer_interrupt, }; static void __init sa1100_timer_init(void) |