diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-07 15:48:49 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:16 -0500 |
commit | 009b4c3b8ad584b3462734127a5bec680d5d6af4 (patch) | |
tree | f7cb860dde86ba96afcc085ec7a75ca2a41e49b6 /kernel/irq/handle.c | |
parent | 6954b75b488dd740950573f244ddd66fd28620aa (diff) |
genirq: Add IRQ_INPROGRESS to core
We need to maintain the flag for now in both fields status and istate.
Add a CONFIG_GENERIC_HARDIRQS_NO_COMPAT switch to allow testing w/o
the status one. Wrap the access to status IRQ_INPROGRESS in a inline
which can be turned of with CONFIG_GENERIC_HARDIRQS_NO_COMPAT along
with the define.
There is no reason that anything outside of core looks at this. That
needs some modifications, but we'll get there.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r-- | kernel/irq/handle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index ff40e0f5e2e2..d4ae0b1ccc00 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -123,13 +123,15 @@ irqreturn_t handle_irq_event(struct irq_desc *desc) | |||
123 | irqreturn_t ret; | 123 | irqreturn_t ret; |
124 | 124 | ||
125 | desc->status &= ~IRQ_PENDING; | 125 | desc->status &= ~IRQ_PENDING; |
126 | desc->status |= IRQ_INPROGRESS; | 126 | irq_compat_set_progress(desc); |
127 | desc->istate |= IRQS_INPROGRESS; | ||
127 | raw_spin_unlock(&desc->lock); | 128 | raw_spin_unlock(&desc->lock); |
128 | 129 | ||
129 | ret = handle_irq_event_percpu(desc, action); | 130 | ret = handle_irq_event_percpu(desc, action); |
130 | 131 | ||
131 | raw_spin_lock(&desc->lock); | 132 | raw_spin_lock(&desc->lock); |
132 | desc->status &= ~IRQ_INPROGRESS; | 133 | desc->istate &= ~IRQS_INPROGRESS; |
134 | irq_compat_clr_progress(desc); | ||
133 | return ret; | 135 | return ret; |
134 | } | 136 | } |
135 | 137 | ||