From: Ishimatsu Yasuaki <isimatu.yasuaki@jp.fujitsu.com>
Date: Fri, 6 Apr 2007 07:51:12 +0000 (+0900)
Subject: [IA64] Fix wrong assumption about irq and vector in msi_ia64.c
X-Git-Tag: v2.6.21-rc7~33^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9438a1218eceb1b3891d242da01bc3cc82cb7342;p=linux-2.6-omap-h63xx.git

[IA64] Fix wrong assumption about irq and vector in msi_ia64.c

This patch fixes a wrong assumption in ia64 MSI code that IRQ equals
vector.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index ebbeadfee42..c81080df70d 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -76,7 +76,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
 
 	set_irq_msi(irq, desc);
 	dest_phys_id = cpu_physical_id(first_cpu(cpu_online_map));
-	vector = irq;
+	vector = irq_to_vector(irq);
 
 	msg.address_hi = 0;
 	msg.address_lo =
@@ -110,7 +110,7 @@ static void ia64_ack_msi_irq(unsigned int irq)
 
 static int ia64_msi_retrigger_irq(unsigned int irq)
 {
-	unsigned int vector = irq;
+	unsigned int vector = irq_to_vector(irq);
 	ia64_resend_irq(vector);
 
 	return 1;