ia64/xen-unstable

changeset 6009:f17987201c08

Manula merge.
author kaf24@firebug.cl.cam.ac.uk
date Wed Aug 03 09:06:10 2005 +0000 (2005-08-03)
parents 178b0b2dae51 0824da1df80a
children d4fd332df775 2c0bc4caaa1f
files linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 linux-2.6-xen-sparse/include/asm-generic/pgtable.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Wed Aug 03 09:05:46 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Wed Aug 03 09:06:10 2005 +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.12-xen0
     1.7 -# Wed Aug  3 00:50:27 2005
     1.8 +# Wed Aug  3 09:54:56 2005
     1.9  #
    1.10  CONFIG_XEN=y
    1.11  CONFIG_ARCH_XEN=y
    1.12 @@ -93,11 +93,11 @@ CONFIG_GENERIC_IOMAP=y
    1.13  # CONFIG_M586 is not set
    1.14  # CONFIG_M586TSC is not set
    1.15  # CONFIG_M586MMX is not set
    1.16 -# CONFIG_M686 is not set
    1.17 +CONFIG_M686=y
    1.18  # CONFIG_MPENTIUMII is not set
    1.19  # CONFIG_MPENTIUMIII is not set
    1.20  # CONFIG_MPENTIUMM is not set
    1.21 -CONFIG_MPENTIUM4=y
    1.22 +# CONFIG_MPENTIUM4 is not set
    1.23  # CONFIG_MK6 is not set
    1.24  # CONFIG_MK7 is not set
    1.25  # CONFIG_MK8 is not set
    1.26 @@ -112,15 +112,15 @@ CONFIG_MPENTIUM4=y
    1.27  # CONFIG_X86_GENERIC is not set
    1.28  CONFIG_X86_CMPXCHG=y
    1.29  CONFIG_X86_XADD=y
    1.30 -CONFIG_X86_L1_CACHE_SHIFT=7
    1.31 +CONFIG_X86_L1_CACHE_SHIFT=5
    1.32  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
    1.33  CONFIG_GENERIC_CALIBRATE_DELAY=y
    1.34 +CONFIG_X86_PPRO_FENCE=y
    1.35  CONFIG_X86_WP_WORKS_OK=y
    1.36  CONFIG_X86_INVLPG=y
    1.37  CONFIG_X86_BSWAP=y
    1.38  CONFIG_X86_POPAD_OK=y
    1.39  CONFIG_X86_GOOD_APIC=y
    1.40 -CONFIG_X86_INTEL_USERCOPY=y
    1.41  CONFIG_X86_USE_PPRO_CHECKSUM=y
    1.42  # CONFIG_HPET_TIMER is not set
    1.43  # CONFIG_HPET_EMULATE_RTC is not set
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Wed Aug 03 09:05:46 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32	Wed Aug 03 09:06:10 2005 +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.12-xenU
     2.7 -# Wed Aug  3 00:52:10 2005
     2.8 +# Wed Aug  3 09:57:44 2005
     2.9  #
    2.10  CONFIG_XEN=y
    2.11  CONFIG_ARCH_XEN=y
    2.12 @@ -90,11 +90,11 @@ CONFIG_GENERIC_IOMAP=y
    2.13  # CONFIG_M586 is not set
    2.14  # CONFIG_M586TSC is not set
    2.15  # CONFIG_M586MMX is not set
    2.16 -# CONFIG_M686 is not set
    2.17 +CONFIG_M686=y
    2.18  # CONFIG_MPENTIUMII is not set
    2.19  # CONFIG_MPENTIUMIII is not set
    2.20  # CONFIG_MPENTIUMM is not set
    2.21 -CONFIG_MPENTIUM4=y
    2.22 +# CONFIG_MPENTIUM4 is not set
    2.23  # CONFIG_MK6 is not set
    2.24  # CONFIG_MK7 is not set
    2.25  # CONFIG_MK8 is not set
    2.26 @@ -109,15 +109,15 @@ CONFIG_MPENTIUM4=y
    2.27  # CONFIG_X86_GENERIC is not set
    2.28  CONFIG_X86_CMPXCHG=y
    2.29  CONFIG_X86_XADD=y
    2.30 -CONFIG_X86_L1_CACHE_SHIFT=7
    2.31 +CONFIG_X86_L1_CACHE_SHIFT=5
    2.32  CONFIG_RWSEM_XCHGADD_ALGORITHM=y
    2.33  CONFIG_GENERIC_CALIBRATE_DELAY=y
    2.34 +CONFIG_X86_PPRO_FENCE=y
    2.35  CONFIG_X86_WP_WORKS_OK=y
    2.36  CONFIG_X86_INVLPG=y
    2.37  CONFIG_X86_BSWAP=y
    2.38  CONFIG_X86_POPAD_OK=y
    2.39  CONFIG_X86_GOOD_APIC=y
    2.40 -CONFIG_X86_INTEL_USERCOPY=y
    2.41  CONFIG_X86_USE_PPRO_CHECKSUM=y
    2.42  # CONFIG_HPET_TIMER is not set
    2.43  # CONFIG_HPET_EMULATE_RTC is not set