ia64/linux-2.6.18-xen.hg

changeset 843:0a9cdf1dbad6

pci: Fix the non-PCI_IOV build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Mar 19 13:48:52 2009 +0000 (2009-03-19)
parents 9e65f17be1cd
children 87c84f7dd850
files drivers/xen/core/pci.c
line diff
     1.1 --- a/drivers/xen/core/pci.c	Thu Mar 19 10:25:31 2009 +0000
     1.2 +++ b/drivers/xen/core/pci.c	Thu Mar 19 13:48:52 2009 +0000
     1.3 @@ -18,6 +18,7 @@ static int pci_bus_probe_wrapper(struct 
     1.4  	struct physdev_manage_pci manage_pci;
     1.5  	struct physdev_manage_pci_ext manage_pci_ext;
     1.6  
     1.7 +#ifdef CONFIG_PCI_IOV
     1.8  	if (pci_dev->is_virtfn) {
     1.9  		memset(&manage_pci_ext, 0, sizeof(manage_pci_ext));
    1.10  		manage_pci_ext.bus = pci_dev->bus->number;
    1.11 @@ -27,7 +28,9 @@ static int pci_bus_probe_wrapper(struct 
    1.12  		manage_pci_ext.physfn.devfn = pci_dev->physfn->devfn;
    1.13  		r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,
    1.14  					  &manage_pci_ext);
    1.15 -	} else if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
    1.16 +	} else
    1.17 +#endif
    1.18 +	if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) {
    1.19  		memset(&manage_pci_ext, 0, sizeof(manage_pci_ext));
    1.20  		manage_pci_ext.bus = pci_dev->bus->number;
    1.21  		manage_pci_ext.devfn = pci_dev->devfn;