summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/chip.c2
-rw-r--r--kernel/irq/internals.h2
-rw-r--r--kernel/irq/spurious.c6
3 files changed, 6 insertions, 4 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index bff21f2..34245e7 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -400,7 +400,7 @@ EXPORT_SYMBOL_GPL(handle_nested_irq);
static bool irq_check_poll(struct irq_desc *desc)
{
- if (!(desc->status & IRQ_POLL_INPROGRESS))
+ if (!(desc->istate & IRQS_POLL_INPROGRESS))
return false;
return irq_wait_for_poll(desc);
}
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index dc5e21b..f5d28e1 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -39,10 +39,12 @@ enum {
* IRQS_AUTODETECT - autodetection in progress
* IRQS_SPURIOUS_DISABLED - was disabled due to spurious interrupt
* detection
+ * IRQS_POLL_INPROGRESS - polling in progress
*/
enum {
IRQS_AUTODETECT = 0x00000001,
IRQS_SPURIOUS_DISABLED = 0x00000002,
+ IRQS_POLL_INPROGRESS = 0x00000008,
};
#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data)
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 2941d8a..21c4617 100644
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -98,13 +98,13 @@ static int try_one_irq(int irq, struct irq_desc *desc, bool force)
}
/* Mark it poll in progress */
- desc->status |= IRQ_POLL_INPROGRESS;
+ desc->istate |= IRQS_POLL_INPROGRESS;
do {
if (handle_irq_event(desc) == IRQ_HANDLED)
ret = IRQ_HANDLED;
action = desc->action;
} while ((desc->status & IRQ_PENDING) && action);
- desc->status &= ~IRQ_POLL_INPROGRESS;
+ desc->istate &= ~IRQS_POLL_INPROGRESS;
out:
raw_spin_unlock(&desc->lock);
return ret == IRQ_HANDLED;
@@ -259,7 +259,7 @@ try_misrouted_irq(unsigned int irq, struct irq_desc *desc,
void note_interrupt(unsigned int irq, struct irq_desc *desc,
irqreturn_t action_ret)
{
- if (desc->status & IRQ_POLL_INPROGRESS)
+ if (desc->istate & IRQS_POLL_INPROGRESS)
return;
if (unlikely(action_ret != IRQ_HANDLED)) {