From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 12 Feb 2011 10:51:03 +0000 (+0100)
Subject: x86: Readd missing irq_to_desc() in fixup_irq()
X-Git-Tag: v2.6.37.1~38
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=874349687931814d5afa98081795a77ce3cd5231;p=unionfs-2.6.39.y.git

x86: Readd missing irq_to_desc() in fixup_irq()

commit 5117348dea5e3ecbb785cfa1271386fb49332b41 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 83ec0175f98..e430114ba32 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -357,7 +357,8 @@ void fixup_irqs(void)
 		if (irr  & (1 << (vector % 32))) {
 			irq = __get_cpu_var(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);