direct-io.hg

changeset 3325:c8def7019487

bitkeeper revision 1.1159.1.503 (41cad0d4p3J5sYi-_a0Mz6vhaLrL8Q)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@scramble.cl.cam.ac.uk
date Thu Dec 23 14:06:12 2004 +0000 (2004-12-23)
parents ddc28d82a044 d3386947d930
children 6b1aa25ff284
files linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig
line diff
     1.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Wed Dec 22 22:16:48 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xen0_defconfig	Thu Dec 23 14:06:12 2004 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  #
     1.5  # Automatically generated make config: don't edit
     1.6  # Linux kernel version: 2.6.9-xen0
     1.7 -# Wed Dec  1 09:22:49 2004
     1.8 +# Thu Dec 23 14:01:43 2004
     1.9  #
    1.10  CONFIG_XEN=y
    1.11  CONFIG_ARCH_XEN=y
    1.12 @@ -77,6 +77,11 @@ CONFIG_XENARCH="i386"
    1.13  CONFIG_MMU=y
    1.14  CONFIG_UID16=y
    1.15  CONFIG_GENERIC_ISA_DMA=y
    1.16 +# CONFIG_M386 is not set
    1.17 +# CONFIG_M486 is not set
    1.18 +# CONFIG_M586 is not set
    1.19 +# CONFIG_M586TSC is not set
    1.20 +# CONFIG_M586MMX is not set
    1.21  # CONFIG_M686 is not set
    1.22  # CONFIG_MPENTIUMII is not set
    1.23  # CONFIG_MPENTIUMIII is not set
    1.24 @@ -86,6 +91,9 @@ CONFIG_MPENTIUM4=y
    1.25  # CONFIG_MK7 is not set
    1.26  # CONFIG_MK8 is not set
    1.27  # CONFIG_MCRUSOE is not set
    1.28 +# CONFIG_MWINCHIPC6 is not set
    1.29 +# CONFIG_MWINCHIP2 is not set
    1.30 +# CONFIG_MWINCHIP3D is not set
    1.31  # CONFIG_MCYRIXIII is not set
    1.32  # CONFIG_MVIAC3_2 is not set
    1.33  # CONFIG_X86_GENERIC is not set
     2.1 --- a/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Wed Dec 22 22:16:48 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/configs/xenU_defconfig	Thu Dec 23 14:06:12 2004 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6  # Linux kernel version: 2.6.9-xenU
     2.7 -# Wed Dec  1 09:22:09 2004
     2.8 +# Thu Dec 23 14:02:24 2004
     2.9  #
    2.10  CONFIG_XEN=y
    2.11  CONFIG_ARCH_XEN=y
    2.12 @@ -76,6 +76,11 @@ CONFIG_XENARCH="i386"
    2.13  CONFIG_MMU=y
    2.14  CONFIG_UID16=y
    2.15  CONFIG_GENERIC_ISA_DMA=y
    2.16 +# CONFIG_M386 is not set
    2.17 +# CONFIG_M486 is not set
    2.18 +# CONFIG_M586 is not set
    2.19 +# CONFIG_M586TSC is not set
    2.20 +# CONFIG_M586MMX is not set
    2.21  # CONFIG_M686 is not set
    2.22  # CONFIG_MPENTIUMII is not set
    2.23  # CONFIG_MPENTIUMIII is not set
    2.24 @@ -85,6 +90,9 @@ CONFIG_MPENTIUM4=y
    2.25  # CONFIG_MK7 is not set
    2.26  # CONFIG_MK8 is not set
    2.27  # CONFIG_MCRUSOE is not set
    2.28 +# CONFIG_MWINCHIPC6 is not set
    2.29 +# CONFIG_MWINCHIP2 is not set
    2.30 +# CONFIG_MWINCHIP3D is not set
    2.31  # CONFIG_MCYRIXIII is not set
    2.32  # CONFIG_MVIAC3_2 is not set
    2.33  # CONFIG_X86_GENERIC is not set