x86: Readd missing irq_to_desc() in fixup_irq()

commit a3c08e5d(x86: Convert irq_chip access to new functions)
accidentally zapped desc = irq_to_desc(irq); in the vector loop.
So we lock some random irq descriptor.

Add it back.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@kernel.org> # .37
This commit is contained in:
Thomas Gleixner 2011-02-12 11:51:03 +01:00
parent 2fb270f321
commit 5117348dea
1 changed files with 2 additions and 1 deletions

View File

@ -367,7 +367,8 @@ void fixup_irqs(void)
if (irr & (1 << (vector % 32))) { if (irr & (1 << (vector % 32))) {
irq = __this_cpu_read(vector_irq[vector]); irq = __this_cpu_read(vector_irq[vector]);
data = irq_get_irq_data(irq); desc = irq_to_desc(irq);
data = &desc->irq_data;
raw_spin_lock(&desc->lock); raw_spin_lock(&desc->lock);
if (data->chip->irq_retrigger) if (data->chip->irq_retrigger)
data->chip->irq_retrigger(data); data->chip->irq_retrigger(data);