[Xen-changelog] [linux-2.6.18-xen] pci: Fix the non-PCI_IOV build.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1237470532 0
# Node ID 0a9cdf1dbad6127156609dcf389afeac09081210
# Parent  9e65f17be1cd4b4ac8b7de36fa3bbc5b14c00991
pci: Fix the non-PCI_IOV build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 drivers/xen/core/pci.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -r 9e65f17be1cd -r 0a9cdf1dbad6 drivers/xen/core/pci.c
--- a/drivers/xen/core/pci.c    Thu Mar 19 10:25:31 2009 +0000
+++ b/drivers/xen/core/pci.c    Thu Mar 19 13:48:52 2009 +0000
@@ -18,6 +18,7 @@ static int pci_bus_probe_wrapper(struct 
        struct physdev_manage_pci manage_pci;
        struct physdev_manage_pci_ext manage_pci_ext;
 
+#ifdef CONFIG_PCI_IOV
        if (pci_dev->is_virtfn) {
                memset(&manage_pci_ext, 0, sizeof(manage_pci_ext));
                manage_pci_ext.bus = pci_dev->bus->number;
@@ -27,7 +28,9 @@ static int pci_bus_probe_wrapper(struct 
                manage_pci_ext.physfn.devfn = pci_dev->physfn->devfn;
                r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,
                                          &manage_pci_ext);
-       } else if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
+       } else
+#endif
+       if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
                memset(&manage_pci_ext, 0, sizeof(manage_pci_ext));
                manage_pci_ext.bus = pci_dev->bus->number;
                manage_pci_ext.devfn = pci_dev->devfn;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog