ia64/xen-unstable

changeset 4230:dbdf796cd98c

bitkeeper revision 1.1159.272.2 (423dcf7cq_wRMtRWREguqLLbacTtyw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
author iap10@freefall.cl.cam.ac.uk
date Sun Mar 20 19:31:08 2005 +0000 (2005-03-20)
parents 60fdb1da841d 1a1a16726bd2
children 763faed40f9d
files linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h xen/common/physdev.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers	Fri Mar 18 13:06:04 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers	Sun Mar 20 19:31:08 2005 +0000
     1.3 @@ -44,6 +44,8 @@ source "drivers/media/Kconfig"
     1.4  source "drivers/video/Kconfig"
     1.5  source "sound/Kconfig"
     1.6  source "drivers/usb/Kconfig"
     1.7 +source "drivers/mmc/Kconfig"
     1.8 +source "drivers/infiniband/Kconfig"
     1.9  endif
    1.10  
    1.11  if !XEN_PHYSDEV_ACCESS
     2.1 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Fri Mar 18 13:06:04 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig	Sun Mar 20 19:31:08 2005 +0000
     2.3 @@ -888,6 +888,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
     2.4  # CONFIG_USB_GADGET is not set
     2.5  
     2.6  #
     2.7 +# MMC/SD Card support
     2.8 +#
     2.9 +# CONFIG_MMC is not set
    2.10 +
    2.11 +#
    2.12 +# InfiniBand support
    2.13 +#
    2.14 +# CONFIG_INFINIBAND is not set
    2.15 +
    2.16 +#
    2.17  # File systems
    2.18  #
    2.19  CONFIG_EXT2_FS=y
     3.1 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h	Fri Mar 18 13:06:04 2005 +0000
     3.2 +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/floppy.h	Sun Mar 20 19:31:08 2005 +0000
     3.3 @@ -186,7 +186,7 @@ static int xen_floppy_init(void)
     3.4  {
     3.5  	use_virtual_dma = 1;
     3.6  	can_use_virtual_dma = 1;
     3.7 -	return 0x340;
     3.8 +	return 0x3f0;
     3.9  }
    3.10  
    3.11  /*
     4.1 --- a/xen/common/physdev.c	Fri Mar 18 13:06:04 2005 +0000
     4.2 +++ b/xen/common/physdev.c	Sun Mar 20 19:31:08 2005 +0000
     4.3 @@ -733,22 +733,6 @@ void physdev_init_dom0(struct domain *p)
     4.4              continue;
     4.5          }
     4.6  
     4.7 -        /* Skip bridges and other peculiarities for now.
     4.8 -         *
     4.9 -         * Note that this can prevent the guest from detecting devices
    4.10 -         * with fn>0 on slots where the fn=0 device is a bridge.  We
    4.11 -         * can identify such slots by looking at the multifunction bit
    4.12 -         * (top bit of hdr_type, masked out in dev->hdr_type).
    4.13 -         *
    4.14 -         * In Linux2.4 we find all devices because the detection code
    4.15 -         * scans all functions if the read of the fn=0 device's header
    4.16 -         * type fails.
    4.17 -         *
    4.18 -         * In Linux2.6 we set pcibios_scan_all_fns().
    4.19 -         */
    4.20 -        if ( (dev->hdr_type != PCI_HEADER_TYPE_NORMAL) &&
    4.21 -             (dev->hdr_type != PCI_HEADER_TYPE_CARDBUS) )
    4.22 -            continue;
    4.23          pdev = xmalloc(sizeof(phys_dev_t));
    4.24          pdev->dev = dev;
    4.25          pdev->flags = ACC_WRITE;