aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-08 05:39:15 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 06:58:16 -0500
commit163ef3091195f514a06f064b12914597d2644c55 (patch)
treea6e222b1a7366aa93c884257063aa36ef17cf91f /kernel/irq/chip.c
parent3d67baec7f1b01fc289ac1a2f1a7e6d5e43391c6 (diff)
genirq: Move IRQ_REPLAY and IRQ_WAITING to core
No users outside of core. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 420fa6bdb117..59ae14527ecd 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -428,7 +428,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
428 if (!irq_check_poll(desc)) 428 if (!irq_check_poll(desc))
429 goto out_unlock; 429 goto out_unlock;
430 430
431 desc->status &= ~(IRQ_REPLAY | IRQ_WAITING); 431 desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
432 kstat_incr_irqs_this_cpu(irq, desc); 432 kstat_incr_irqs_this_cpu(irq, desc);
433 433
434 if (unlikely(!desc->action || (desc->status & IRQ_DISABLED))) 434 if (unlikely(!desc->action || (desc->status & IRQ_DISABLED)))
@@ -460,7 +460,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
460 if (!irq_check_poll(desc)) 460 if (!irq_check_poll(desc))
461 goto out_unlock; 461 goto out_unlock;
462 462
463 desc->status &= ~(IRQ_REPLAY | IRQ_WAITING); 463 desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
464 kstat_incr_irqs_this_cpu(irq, desc); 464 kstat_incr_irqs_this_cpu(irq, desc);
465 465
466 /* 466 /*
@@ -498,7 +498,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
498 if (!irq_check_poll(desc)) 498 if (!irq_check_poll(desc))
499 goto out; 499 goto out;
500 500
501 desc->status &= ~(IRQ_REPLAY | IRQ_WAITING); 501 desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
502 kstat_incr_irqs_this_cpu(irq, desc); 502 kstat_incr_irqs_this_cpu(irq, desc);
503 503
504 /* 504 /*
@@ -537,8 +537,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
537{ 537{
538 raw_spin_lock(&desc->lock); 538 raw_spin_lock(&desc->lock);
539 539
540 desc->status &= ~(IRQ_REPLAY | IRQ_WAITING); 540 desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
541
542 /* 541 /*
543 * If we're currently running this IRQ, or its disabled, 542 * If we're currently running this IRQ, or its disabled,
544 * we shouldn't process the IRQ. Mark it pending, handle 543 * we shouldn't process the IRQ. Mark it pending, handle