diff options
Diffstat (limited to 'base/kernel/config')
| -rw-r--r-- | base/kernel/config | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/base/kernel/config b/base/kernel/config index db1215503..2de4721e7 100644 --- a/base/kernel/config +++ b/base/kernel/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32 -# Mon Dec 7 13:33:58 2009 +# Linux kernel version: 2.6.32.2 +# Mon Dec 21 10:06:19 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -208,7 +208,6 @@ CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -# CONFIG_XEN is not set CONFIG_VMI=y CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y @@ -303,8 +302,8 @@ CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_X86_CPU_DEBUG is not set # CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMSPLIT_2G is not set @@ -312,8 +311,7 @@ CONFIG_VMSPLIT_3G=y # CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y -CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -326,7 +324,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=y +# CONFIG_PHYS_ADDR_T_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y @@ -1602,7 +1600,6 @@ 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 |