From ccc8b263464b1e37155b560f2b13a092b07e5ba8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 24 Feb 2009 18:18:06 +0100 Subject: [PATCH 1/1] Revert "Next try to enable PAE support." This reverts commit b88a186fc46da77db203fc0238efce709dd6ba13. --- config/kernel/kernel.config.i586 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index dc41712aee..9a4e558fd1 100644 --- a/config/kernel/kernel.config.i586 +++ b/config/kernel/kernel.config.i586 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25.19-ipfire -# Fri Feb 6 10:20:35 2009 +# Thu Nov 6 10:24:53 2008 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -171,6 +171,7 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_XEN=y CONFIG_VMI=y +CONFIG_LGUEST_GUEST=y CONFIG_PARAVIRT=y # CONFIG_M386 is not set # CONFIG_M486 is not set @@ -234,11 +235,11 @@ CONFIG_MICROCODE=m CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=y -CONFIG_NOHIGHMEM=y -# CONFIG_HIGHMEM4G is not set +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_X86_PAE=y +CONFIG_HIGHMEM=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -251,10 +252,11 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_SPARSEMEM_STATIC=y # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_RESOURCES_64BIT=y +# CONFIG_RESOURCES_64BIT is not set CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y +# CONFIG_HIGHPTE is not set CONFIG_MATH_EMULATION=y CONFIG_MTRR=y # CONFIG_EFI is not set @@ -267,11 +269,13 @@ CONFIG_HZ_100=y CONFIG_HZ=100 # CONFIG_SCHED_HRTICK is not set # CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y # # Power management options @@ -1880,6 +1884,7 @@ CONFIG_PRINTER=m CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y CONFIG_HVC_XEN=y +CONFIG_VIRTIO_CONSOLE=y CONFIG_IPMI_HANDLER=m CONFIG_IPMI_PANIC_EVENT=y # CONFIG_IPMI_PANIC_STRING is not set @@ -3247,8 +3252,9 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m -CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m +CONFIG_LGUEST=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m -- 2.39.2