ia64/xen-unstable

changeset 4220:97a5b9def4b3

bitkeeper revision 1.1236.1.88 (423c8d8cq6U-IPZOZ22Ewk0luopVlw)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Sat Mar 19 20:37:32 2005 +0000 (2005-03-19)
parents f65a0740ac41 735a0b87a9a1
children 3b13b05d7111
files linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig xen/common/physdev.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Sat Mar 19 19:46:17 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Sat Mar 19 20:37:32 2005 +0000
     1.3 @@ -900,6 +900,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
     1.4  # CONFIG_INFINIBAND is not set
     1.5  
     1.6  #
     1.7 +# MMC/SD Card support
     1.8 +#
     1.9 +# CONFIG_MMC is not set
    1.10 +
    1.11 +#
    1.12 +# InfiniBand support
    1.13 +#
    1.14 +# CONFIG_INFINIBAND is not set
    1.15 +
    1.16 +#
    1.17  # File systems
    1.18  #
    1.19  CONFIG_EXT2_FS=y
     2.1 --- a/xen/common/physdev.c	Sat Mar 19 19:46:17 2005 +0000
     2.2 +++ b/xen/common/physdev.c	Sat Mar 19 20:37:32 2005 +0000
     2.3 @@ -795,22 +795,6 @@ void physdev_init_dom0(struct domain *p)
     2.4              continue;
     2.5          }
     2.6  
     2.7 -        /* Skip bridges and other peculiarities for now.
     2.8 -         *
     2.9 -         * Note that this can prevent the guest from detecting devices
    2.10 -         * with fn>0 on slots where the fn=0 device is a bridge.  We
    2.11 -         * can identify such slots by looking at the multifunction bit
    2.12 -         * (top bit of hdr_type, masked out in dev->hdr_type).
    2.13 -         *
    2.14 -         * In Linux2.4 we find all devices because the detection code
    2.15 -         * scans all functions if the read of the fn=0 device's header
    2.16 -         * type fails.
    2.17 -         *
    2.18 -         * In Linux2.6 we set pcibios_scan_all_fns().
    2.19 -         */
    2.20 -        if ( (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) &&
    2.21 -             (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) )
    2.22 -            continue;
    2.23  
    2.24          if ( (pdev = xmalloc(phys_dev_t)) == NULL ) {
    2.25              INFO("failed to allocate physical device structure!\n");