From 289b87602243a1e44fc357ddd5d1a3d1c372d8e5 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 16 Feb 2011 13:43:04 -0500
Subject: [PATCH] --- yaml --- r: 234193 b: refs/heads/master c:
 55cb8cd45e0600df1473489518d7f12ce1bbe973 h: refs/heads/master i:   234191:
 90cea0c7b1b9649fdba9dc1e315e87acfa32c54c v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/pci/xen.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index aa9c6e6cba35..eb82c4e80abf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d4610527bc71d3f9eea520fc51a02d54f79dcd0
+refs/heads/master: 55cb8cd45e0600df1473489518d7f12ce1bbe973
diff --git a/trunk/arch/x86/pci/xen.c b/trunk/arch/x86/pci/xen.c
index 25cd4a07d09f..6432f751ee4f 100644
--- a/trunk/arch/x86/pci/xen.c
+++ b/trunk/arch/x86/pci/xen.c
@@ -157,14 +157,14 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 		goto error;
 	i = 0;
 	list_for_each_entry(msidesc, &dev->msi_list, list) {
-		irq = xen_allocate_pirq(v[i], 0, /* not sharable */
+		xen_allocate_pirq_msi(
 			(type == PCI_CAP_ID_MSIX) ?
-			"pcifront-msi-x" : "pcifront-msi");
+			"pcifront-msi-x" : "pcifront-msi",
+			&irq, &v[i], XEN_ALLOC_IRQ);
 		if (irq < 0) {
 			ret = -1;
 			goto free;
 		}
-
 		ret = set_irq_msi(irq, msidesc);
 		if (ret)
 			goto error_while;