ia64/xen-unstable

changeset 7693:06abebc3a56d

Make xen0's default config match itself after a "make oldconfig"
author unknown@aosda.research.intel-research.net
date Mon Nov 07 18:25:09 2005 +0100 (2005-11-07)
parents 188fc4838586
children 889814fb94c5
files linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Mon Nov 07 17:54:55 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32	Mon Nov 07 18:25:09 2005 +0100
     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 09:54:56 2005
     1.8 +# Linux kernel version: 2.6.12.6-xen0
     1.9 +# Mon Nov  7 17:22:05 2005
    1.10  #
    1.11  CONFIG_XEN=y
    1.12  CONFIG_ARCH_XEN=y
    1.13 @@ -151,11 +151,9 @@ CONFIG_X86_IO_APIC=y
    1.14  CONFIG_X86_UP_APIC=y
    1.15  CONFIG_X86_UP_IOAPIC=y
    1.16  CONFIG_PCI=y
    1.17 -# CONFIG_PCI_GOBIOS is not set
    1.18  # CONFIG_PCI_GOMMCONFIG is not set
    1.19  # CONFIG_PCI_GODIRECT is not set
    1.20  CONFIG_PCI_GOANY=y
    1.21 -CONFIG_PCI_BIOS=y
    1.22  CONFIG_PCI_DIRECT=y
    1.23  CONFIG_PCI_MMCONFIG=y
    1.24  # CONFIG_PCIEPORTBUS is not set
    1.25 @@ -540,7 +538,7 @@ CONFIG_IP_NF_MATCH_IPRANGE=m
    1.26  # CONFIG_IP_NF_MATCH_STATE is not set
    1.27  # CONFIG_IP_NF_MATCH_CONNTRACK is not set
    1.28  # CONFIG_IP_NF_MATCH_OWNER is not set
    1.29 -CONFIG_IP_NF_MATCH_PHYSDEV=y
    1.30 +CONFIG_IP_NF_MATCH_PHYSDEV=m
    1.31  # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
    1.32  # CONFIG_IP_NF_MATCH_REALM is not set
    1.33  # CONFIG_IP_NF_MATCH_SCTP is not set
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Mon Nov 07 17:54:55 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64	Mon Nov 07 18:25:09 2005 +0100
     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.4-xen0
     2.7 -# Mon Aug 15 18:57:19 2005
     2.8 +# Linux kernel version: 2.6.12.6-xen0
     2.9 +# Mon Nov  7 17:24:18 2005
    2.10  #
    2.11  CONFIG_XEN=y
    2.12  CONFIG_ARCH_XEN=y
    2.13 @@ -92,6 +92,7 @@ CONFIG_X86_GOOD_APIC=y
    2.14  # CONFIG_PREEMPT is not set
    2.15  CONFIG_MICROCODE=y
    2.16  # CONFIG_X86_CPUID is not set
    2.17 +CONFIG_SWIOTLB=y
    2.18  # CONFIG_NUMA is not set
    2.19  # CONFIG_MTRR is not set
    2.20  CONFIG_X86_LOCAL_APIC=y
    2.21 @@ -122,7 +123,6 @@ CONFIG_X86_XEN_GENAPIC=y
    2.22  # CONFIG_X86_MSR is not set
    2.23  # CONFIG_GART_IOMMU is not set
    2.24  CONFIG_DUMMY_IOMMU=y
    2.25 -CONFIG_SWIOTLB=y
    2.26  # CONFIG_X86_MCE is not set
    2.27  
    2.28  #
    2.29 @@ -480,7 +480,7 @@ CONFIG_IP_NF_MATCH_IPRANGE=m
    2.30  # CONFIG_IP_NF_MATCH_STATE is not set
    2.31  # CONFIG_IP_NF_MATCH_CONNTRACK is not set
    2.32  # CONFIG_IP_NF_MATCH_OWNER is not set
    2.33 -CONFIG_IP_NF_MATCH_PHYSDEV=y
    2.34 +CONFIG_IP_NF_MATCH_PHYSDEV=m
    2.35  # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
    2.36  # CONFIG_IP_NF_MATCH_REALM is not set
    2.37  # CONFIG_IP_NF_MATCH_SCTP is not set