diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-07 22:11:30 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 12:58:17 +0100 |
| commit | c1594b77e46124bb462f961e536120e471c67446 (patch) | |
| tree | 3f52ad5809125ab5be6db1fd4b1212fe6127df66 /kernel/irq/manage.c | |
| parent | 163ef3091195f514a06f064b12914597d2644c55 (diff) | |
| download | kernel_samsung_smdk4412-c1594b77e46124bb462f961e536120e471c67446.zip kernel_samsung_smdk4412-c1594b77e46124bb462f961e536120e471c67446.tar.gz kernel_samsung_smdk4412-c1594b77e46124bb462f961e536120e471c67446.tar.bz2 | |
genirq: Move IRQ_DISABLED to core
Keep status in sync until all abusers are fixed.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 7971df5..77ff275 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -646,7 +646,7 @@ again: goto again; } - if (!(desc->status & IRQ_DISABLED) && (desc->status & IRQ_MASKED)) { + if (!(desc->istate & IRQS_DISABLED) && (desc->status & IRQ_MASKED)) { desc->status &= ~IRQ_MASKED; desc->irq_data.chip->irq_unmask(&desc->irq_data); } @@ -709,7 +709,7 @@ static int irq_thread(void *data) atomic_inc(&desc->threads_active); raw_spin_lock_irq(&desc->lock); - if (unlikely(desc->status & IRQ_DISABLED)) { + if (unlikely(desc->istate & IRQS_DISABLED)) { /* * CHECKME: We might need a dedicated * IRQ_THREAD_PENDING flag here, which |