---

yaml --- r: 233253 b: refs/heads/master c: 5117348 h: refs/heads/master i: 233251: e9cb189 v: v3
git-mirror · Feb 12, 2011 · d8a4f00 · d8a4f00
1 parent 8810420
commit d8a4f00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb270f3212a1e6a73f86f76c85caee93aae4386
+refs/heads/master: 5117348dea5e3ecbb785cfa1271386fb49332b41
diff --git a/trunk/arch/x86/kernel/irq.c b/trunk/arch/x86/kernel/irq.c
@@ -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);