diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-07 14:40:54 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:15 -0500 |
commit | 7acdd53e5b2c55b6f7e3427e85e2f91fa814a4f9 (patch) | |
tree | 4806536bae32605a3107d6c4384547693eda566c /kernel/irq/spurious.c | |
parent | bd062e7667ac173afef57fbfe9327f3b914a9d4c (diff) |
genirq: Move IRQ_SPURIOUS_DISABLED to core state
No users outside.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/spurious.c')
-rw-r--r-- | kernel/irq/spurious.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index bc0620745d5f..2941d8a22df7 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -146,15 +146,15 @@ static void poll_spurious_irqs(unsigned long dummy) | |||
146 | irq_poll_cpu = smp_processor_id(); | 146 | irq_poll_cpu = smp_processor_id(); |
147 | 147 | ||
148 | for_each_irq_desc(i, desc) { | 148 | for_each_irq_desc(i, desc) { |
149 | unsigned int status; | 149 | unsigned int state; |
150 | 150 | ||
151 | if (!i) | 151 | if (!i) |
152 | continue; | 152 | continue; |
153 | 153 | ||
154 | /* Racy but it doesn't matter */ | 154 | /* Racy but it doesn't matter */ |
155 | status = desc->status; | 155 | state = desc->istate; |
156 | barrier(); | 156 | barrier(); |
157 | if (!(status & IRQ_SPURIOUS_DISABLED)) | 157 | if (!(state & IRQS_SPURIOUS_DISABLED)) |
158 | continue; | 158 | continue; |
159 | 159 | ||
160 | local_irq_disable(); | 160 | local_irq_disable(); |
@@ -298,7 +298,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, | |||
298 | * Now kill the IRQ | 298 | * Now kill the IRQ |
299 | */ | 299 | */ |
300 | printk(KERN_EMERG "Disabling IRQ #%d\n", irq); | 300 | printk(KERN_EMERG "Disabling IRQ #%d\n", irq); |
301 | desc->status |= IRQ_SPURIOUS_DISABLED; | 301 | desc->istate |= IRQS_SPURIOUS_DISABLED; |
302 | desc->depth++; | 302 | desc->depth++; |
303 | irq_disable(desc); | 303 | irq_disable(desc); |
304 | 304 | ||