|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [linux-2.6.18-xen] Fix default configs for x86/32 and x86/64.
# HG changeset patch # User Keir Fraser <keir@xxxxxxxxxxxxx> # Date 1192523660 -3600 # Node ID ff61d4335750af17daccbadfa5478e9200d1e09d # Parent 7cc393197e564914ad852984a929aa5b30ad3678 Fix default configs for x86/32 and x86/64. Signed-off-by: Atsushi SAKAI <sakaia@xxxxxxxxxxxxxx> --- buildconfigs/linux-defconfig_xen0_x86_32 | 32 +++++++++++++++++-------------- buildconfigs/linux-defconfig_xen0_x86_64 | 18 ++++++++++++----- buildconfigs/linux-defconfig_xenU_x86_32 | 20 ++++++------------- buildconfigs/linux-defconfig_xenU_x86_64 | 11 +++++----- buildconfigs/linux-defconfig_xen_x86_64 | 11 ++++++---- 5 files changed, 51 insertions(+), 41 deletions(-) diff -r 7cc393197e56 -r ff61d4335750 buildconfigs/linux-defconfig_xen0_x86_32 --- a/buildconfigs/linux-defconfig_xen0_x86_32 Mon Oct 15 14:39:56 2007 +0100 +++ b/buildconfigs/linux-defconfig_xen0_x86_32 Tue Oct 16 09:34:20 2007 +0100 @@ -1,10 +1,9 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18-xen0 -# Wed Jan 17 18:35:52 2007 +# Linux kernel version: 2.6.18.8 +# Tue Oct 16 09:31:19 2007 # CONFIG_X86_32=y -CONFIG_GENERIC_TIME=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -142,7 +141,6 @@ CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_GOOD_APIC=y CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y CONFIG_NR_CPUS=8 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set @@ -177,7 +175,7 @@ CONFIG_FLATMEM=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y # CONFIG_HIGHPTE is not set CONFIG_MTRR=y @@ -197,11 +195,18 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # Power management options (ACPI, APM) # CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_SOFTWARE_SUSPEND is not set +CONFIG_SUSPEND_SMP=y # # ACPI (Advanced Configuration and Power Interface) Support # CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_FS=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -210,6 +215,7 @@ CONFIG_ACPI_FAN=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=m CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_THERMAL=m CONFIG_ACPI_ASUS=m CONFIG_ACPI_IBM=m @@ -220,7 +226,8 @@ CONFIG_ACPI_EC=y CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y -# CONFIG_ACPI_CONTAINER is not set +CONFIG_ACPI_CONTAINER=m +CONFIG_ACPI_PV_SLEEP=y # # CPU Frequency scaling @@ -394,7 +401,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set -# CONFIG_SYS_HYPERVISOR is not set +CONFIG_SYS_HYPERVISOR=y # # Connector - unified userspace <-> kernelspace linker @@ -934,7 +941,6 @@ CONFIG_DRM_SIS=m # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -1386,7 +1392,7 @@ CONFIG_CRYPTO_CRC32C=m # # CONFIG_CRYPTO_DEV_PADLOCK is not set CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030205 +CONFIG_XEN_INTERFACE_VERSION=0x00030206 # # XEN @@ -1405,6 +1411,7 @@ CONFIG_XEN_PCIDEV_BACKEND=y # CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set CONFIG_XEN_PCIDEV_BACKEND_PASS=y # CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set +# CONFIG_XEN_PCIDEV_BACKEND_CONTROLLER is not set # CONFIG_XEN_PCIDEV_BE_DEBUG is not set CONFIG_XEN_TPMDEV_BACKEND=m CONFIG_XEN_BLKDEV_FRONTEND=y @@ -1415,15 +1422,12 @@ CONFIG_XEN_COMPAT_030002_AND_LATER=y CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_030004_AND_LATER is not set # CONFIG_XEN_COMPAT_LATEST_ONLY is not set -CONFIG_XEN_COMPAT_030002=y -CONFIG_XEN_COMPAT_030004=y +CONFIG_XEN_COMPAT=0x030002 CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y -CONFIG_XEN_UTIL=y +CONFIG_XEN_SMPBOOT=y CONFIG_XEN_BALLOON=y CONFIG_XEN_DEVMEM=y -CONFIG_XEN_REBOOT=y -CONFIG_XEN_SMPBOOT=y # # Library routines diff -r 7cc393197e56 -r ff61d4335750 buildconfigs/linux-defconfig_xen0_x86_64 --- a/buildconfigs/linux-defconfig_xen0_x86_64 Mon Oct 15 14:39:56 2007 +0100 +++ b/buildconfigs/linux-defconfig_xen0_x86_64 Tue Oct 16 09:34:20 2007 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18 -# Wed Jun 27 12:48:41 2007 +# Linux kernel version: 2.6.18.8 +# Tue Oct 16 09:32:39 2007 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -129,7 +129,7 @@ CONFIG_FLATMEM=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_SWIOTLB=y @@ -151,11 +151,17 @@ CONFIG_ISA_DMA_API=y # Power management options # CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_SOFTWARE_SUSPEND is not set # # ACPI (Advanced Configuration and Power Interface) Support # CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SLEEP_PROC_FS=y +# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -174,6 +180,7 @@ CONFIG_ACPI_POWER=y CONFIG_ACPI_POWER=y CONFIG_ACPI_SYSTEM=y # CONFIG_ACPI_CONTAINER is not set +CONFIG_ACPI_PV_SLEEP=y # # CPU Frequency scaling @@ -868,7 +875,6 @@ CONFIG_DRM_SIS=m # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -1334,7 +1340,7 @@ CONFIG_CRYPTO_CRC32C=m # Hardware crypto devices # CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030205 +CONFIG_XEN_INTERFACE_VERSION=0x00030206 # # XEN @@ -1367,6 +1373,8 @@ CONFIG_XEN_COMPAT=0x030002 CONFIG_XEN_COMPAT=0x030002 CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y # # Library routines diff -r 7cc393197e56 -r ff61d4335750 buildconfigs/linux-defconfig_xenU_x86_32 --- a/buildconfigs/linux-defconfig_xenU_x86_32 Mon Oct 15 14:39:56 2007 +0100 +++ b/buildconfigs/linux-defconfig_xenU_x86_32 Tue Oct 16 09:34:20 2007 +0100 @@ -1,10 +1,9 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18-xenU -# Wed Jan 17 18:36:21 2007 +# Linux kernel version: 2.6.18.8 +# Tue Oct 16 09:31:29 2007 # CONFIG_X86_32=y -CONFIG_GENERIC_TIME=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -142,7 +141,6 @@ CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMPXCHG64=y CONFIG_X86_GOOD_APIC=y CONFIG_X86_USE_PPRO_CHECKSUM=y -CONFIG_X86_TSC=y CONFIG_NR_CPUS=8 CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set @@ -174,7 +172,7 @@ CONFIG_FLATMEM=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y # CONFIG_HIGHPTE is not set # CONFIG_REGPARM is not set @@ -305,7 +303,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_FW_LOADER is not set # CONFIG_DEBUG_DRIVER is not set -# CONFIG_SYS_HYPERVISOR is not set +CONFIG_SYS_HYPERVISOR=y # # Connector - unified userspace <-> kernelspace linker @@ -583,7 +581,6 @@ CONFIG_HW_RANDOM_VIA=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -906,7 +903,7 @@ CONFIG_CRYPTO_CRC32C=m # # CONFIG_CRYPTO_DEV_PADLOCK is not set CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030205 +CONFIG_XEN_INTERFACE_VERSION=0x00030206 # # XEN @@ -924,15 +921,12 @@ CONFIG_XEN_COMPAT_030002_AND_LATER=y CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_030004_AND_LATER is not set # CONFIG_XEN_COMPAT_LATEST_ONLY is not set -CONFIG_XEN_COMPAT_030002=y -CONFIG_XEN_COMPAT_030004=y +CONFIG_XEN_COMPAT=0x030002 CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y -CONFIG_XEN_UTIL=y +CONFIG_XEN_SMPBOOT=y CONFIG_XEN_BALLOON=y CONFIG_XEN_DEVMEM=y -CONFIG_XEN_REBOOT=y -CONFIG_XEN_SMPBOOT=y # # Library routines diff -r 7cc393197e56 -r ff61d4335750 buildconfigs/linux-defconfig_xenU_x86_64 --- a/buildconfigs/linux-defconfig_xenU_x86_64 Mon Oct 15 14:39:56 2007 +0100 +++ b/buildconfigs/linux-defconfig_xenU_x86_64 Tue Oct 16 09:34:20 2007 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18 -# Wed Jun 27 12:48:56 2007 +# Linux kernel version: 2.6.18.8 +# Tue Oct 16 09:32:52 2007 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -131,7 +131,7 @@ CONFIG_FLATMEM=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y CONFIG_NR_CPUS=16 # CONFIG_HOTPLUG_CPU is not set @@ -823,7 +823,6 @@ CONFIG_HW_RANDOM=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -1201,7 +1200,7 @@ CONFIG_CRYPTO_CRC32C=m # Hardware crypto devices # CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030205 +CONFIG_XEN_INTERFACE_VERSION=0x00030206 # # XEN @@ -1223,6 +1222,8 @@ CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y CONFIG_XEN_SMPBOOT=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y # # Library routines diff -r 7cc393197e56 -r ff61d4335750 buildconfigs/linux-defconfig_xen_x86_64 --- a/buildconfigs/linux-defconfig_xen_x86_64 Mon Oct 15 14:39:56 2007 +0100 +++ b/buildconfigs/linux-defconfig_xen_x86_64 Tue Oct 16 09:34:20 2007 +0100 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18 -# Wed Jun 27 12:49:06 2007 +# Linux kernel version: 2.6.18.8 +# Tue Oct 16 09:32:25 2007 # CONFIG_X86_64=y CONFIG_64BIT=y @@ -136,7 +136,7 @@ CONFIG_FLATMEM=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set -CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_RESOURCES_64BIT=y CONFIG_NR_CPUS=32 CONFIG_HOTPLUG_CPU=y @@ -193,6 +193,7 @@ CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m +CONFIG_ACPI_PV_SLEEP=y # # CPU Frequency scaling @@ -3079,7 +3080,7 @@ CONFIG_CRYPTO_TEST=m # Hardware crypto devices # CONFIG_XEN=y -CONFIG_XEN_INTERFACE_VERSION=0x00030205 +CONFIG_XEN_INTERFACE_VERSION=0x00030206 # # XEN @@ -3115,6 +3116,8 @@ CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y CONFIG_XEN_SMPBOOT=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y # # Library routines _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |