aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/handle.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 18:07:45 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 18:07:45 -0400
commitb4b9034132c7e1e4474999e688dd7d03b7d97a99 (patch)
treec02c571b9e0e59b9ffa18baae23c83f09ff07adb /kernel/irq/handle.c
parenta8c4c20dfa8b28a3c99e33c639d9c2ea5657741e (diff)
parent07d265dd59456f702b7d2a1ac471f06ee4adc9ef (diff)
Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits) [ARM] 3683/2: ARM: Convert at91rm9200 to generic irq handling [ARM] 3682/2: ARM: Convert ixp4xx to generic irq handling [ARM] 3702/1: ARM: Convert ixp23xx to generic irq handling [ARM] 3701/1: ARM: Convert plat-omap to generic irq handling [ARM] 3700/1: ARM: Convert lh7a40x to generic irq handling [ARM] 3699/1: ARM: Convert s3c2410 to generic irq handling [ARM] 3698/1: ARM: Convert sa1100 to generic irq handling [ARM] 3697/1: ARM: Convert shark to generic irq handling [ARM] 3696/1: ARM: Convert clps711x to generic irq handling [ARM] 3694/1: ARM: Convert ecard driver to generic irq handling [ARM] 3693/1: ARM: Convert omap1 to generic irq handling [ARM] 3691/1: ARM: Convert imx to generic irq handling [ARM] 3688/1: ARM: Convert clps7500 to generic irq handling [ARM] 3687/1: ARM: Convert integrator to generic irq handling [ARM] 3685/1: ARM: Convert pxa to generic irq handling [ARM] 3684/1: ARM: Convert l7200 to generic irq handling [ARM] 3681/1: ARM: Convert ixp2000 to generic irq handling [ARM] 3680/1: ARM: Convert footbridge to generic irq handling [ARM] 3695/1: ARM drivers/pcmcia: Fixup includes [ARM] 3689/1: ARM drivers/input/touchscreen: Fixup includes ... Manual conflict resolved in kernel/irq/handle.c (butt-ugly ARM tickless code).
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r--kernel/irq/handle.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 6070e0464690..6d8b30114961 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -16,6 +16,10 @@
16#include <linux/interrupt.h> 16#include <linux/interrupt.h>
17#include <linux/kernel_stat.h> 17#include <linux/kernel_stat.h>
18 18
19#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)
20#include <asm/dyntick.h>
21#endif
22
19#include "internals.h" 23#include "internals.h"
20 24
21/** 25/**
@@ -92,6 +96,22 @@ struct irq_chip no_irq_chip = {
92}; 96};
93 97
94/* 98/*
99 * Generic dummy implementation which can be used for
100 * real dumb interrupt sources
101 */
102struct irq_chip dummy_irq_chip = {
103 .name = "dummy",
104 .startup = noop_ret,
105 .shutdown = noop,
106 .enable = noop,
107 .disable = noop,
108 .ack = noop,
109 .mask = noop,
110 .unmask = noop,
111 .end = noop,
112};
113
114/*
95 * Special, empty irq handler: 115 * Special, empty irq handler:
96 */ 116 */
97irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs) 117irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs)
@@ -113,6 +133,15 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
113 irqreturn_t ret, retval = IRQ_NONE; 133 irqreturn_t ret, retval = IRQ_NONE;
114 unsigned int status = 0; 134 unsigned int status = 0;
115 135
136#if defined(CONFIG_NO_IDLE_HZ) && defined(CONFIG_ARM)
137 if (!(action->flags & SA_TIMER) && system_timer->dyn_tick != NULL) {
138 write_seqlock(&xtime_lock);
139 if (system_timer->dyn_tick->state & DYN_TICK_ENABLED)
140 system_timer->dyn_tick->handler(irq, 0, regs);
141 write_sequnlock(&xtime_lock);
142 }
143#endif
144
116 if (!(action->flags & IRQF_DISABLED)) 145 if (!(action->flags & IRQF_DISABLED))
117 local_irq_enable(); 146 local_irq_enable();
118 147