Skip to content

Commit

Permalink
x86: Readd missing irq_to_desc() in fixup_irq()
Browse files Browse the repository at this point in the history
commit a3c08e5(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
  • Loading branch information
Thomas Gleixner committed Feb 12, 2011
1 parent 2fb270f commit 5117348
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,8 @@ void fixup_irqs(void)
if (irr & (1 << (vector % 32))) {
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);
if (data->chip->irq_retrigger)
data->chip->irq_retrigger(data);
Expand Down

0 comments on commit 5117348

Please sign in to comment.