diff options
Diffstat (limited to 'testing/linux-vserver/kernelconfig')
| -rw-r--r-- | testing/linux-vserver/kernelconfig | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/testing/linux-vserver/kernelconfig b/testing/linux-vserver/kernelconfig index 2a3501250f..b6db32b21f 100644 --- a/testing/linux-vserver/kernelconfig +++ b/testing/linux-vserver/kernelconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.30.7-vs2.3.0.36.14-pre8 -# Tue Sep 22 11:34:29 2009 +# Linux kernel version: 2.6.30.8-vs2.3.0.36.14-pre8 +# Mon Oct 5 08:18:08 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -200,7 +200,6 @@ CONFIG_PARAVIRT_GUEST=y CONFIG_VMI=y # CONFIG_KVM_CLOCK is not set CONFIG_KVM_GUEST=y -CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_SPINLOCKS is not set # CONFIG_PARAVIRT_CLOCK is not set @@ -245,6 +244,7 @@ CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y +CONFIG_X86_CMPXCHG64=y CONFIG_X86_MINIMUM_CPU_FAMILY=4 # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y @@ -280,8 +280,8 @@ CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_X86_CPU_DEBUG=m # CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set +# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM64G=y CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set @@ -289,7 +289,8 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +CONFIG_X86_PAE=y +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -302,7 +303,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y @@ -1551,6 +1552,7 @@ CONFIG_IEEE1394_DV1394=m CONFIG_I2O=m CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y CONFIG_I2O_EXT_ADAPTEC=y +CONFIG_I2O_EXT_ADAPTEC_DMA64=y CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -2262,7 +2264,7 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -3772,7 +3774,6 @@ CONFIG_RTC_DRV_PCF50633=m # # on-CPU RTC drivers # -# CONFIG_DMADEVICES is not set CONFIG_AUXDISPLAY=y CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 @@ -4314,9 +4315,8 @@ CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m # CONFIG_KVM_TRACE is not set -CONFIG_LGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m CONFIG_BINARY_PRINTF=y |