From 791370c97e303307ca1dac24c3b2cbd2d0bf8d81 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Thu, 5 Feb 2009 19:09:50 +0100 Subject: [PATCH] Revert "Enabled PAE in kernel config to provide paravirtualization support to Xen." I think we need the DMA Engine This reverts commit 3b84578712d87459d743bb0c30cfa9854b3ad3ce. --- config/kernel/kernel.config.i586 | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/config/kernel/kernel.config.i586 b/config/kernel/kernel.config.i586 index 99d191e474..8a7a95621b 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 -# Thu Feb 5 17:46:59 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 @@ -235,11 +236,10 @@ CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=y # CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -CONFIG_HIGHMEM64G=y +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y -CONFIG_X86_PAE=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y @@ -252,7 +252,7 @@ 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 @@ -1884,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 @@ -2922,6 +2923,19 @@ CONFIG_RTC_DRV_V3020=m # # on-CPU RTC drivers # +CONFIG_DMADEVICES=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y +CONFIG_DCA=m # CONFIG_AUXDISPLAY is not set # @@ -3238,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