X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;fp=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1bb5c6cee3ebb140e30e421c05615bf94b001936;hb=e76e5b2c663ac74ae6a542ac20795c625e36a5cd;hp=da99ffcdfde62a006bcbcf84a496c4f4ea8de755;hpb=32527bc0e4b4fa7711ad1c923cf64ae72a7ffd9d;p=linux-2.6-omap-h63xx.git

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index da99ffcdfde..1bb5c6cee3e 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3468,6 +3468,10 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 	struct intel_iommu *iommu = NULL;
 	int index = 0;
 
+	/* x86 doesn't support multiple MSI yet */
+	if (type == PCI_CAP_ID_MSI && nvec > 1)
+		return 1;
+
 	irq_want = nr_irqs_gsi;
 	sub_handle = 0;
 	list_for_each_entry(msidesc, &dev->msi_list, list) {