From 207ef53efe09d0dec331d776609a6b7c0b5092f2 Mon Sep 17 00:00:00 2001 From: Zygo Blaxell Date: Mon, 7 May 2012 21:00:10 -0400 Subject: [PATCH] zygo: disable IOMMU as it is being implicated in oops backtraces --- .config | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.config b/.config index eb6b888a07af..5575abd6415c 100644 --- a/.config +++ b/.config @@ -18,7 +18,7 @@ CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_MMU=y CONFIG_ZONE_DMA=y -CONFIG_NEED_DMA_MAP_STATE=y +# CONFIG_NEED_DMA_MAP_STATE is not set CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_GENERIC_ISA_DMA=y CONFIG_GENERIC_IOMAP=y @@ -44,7 +44,6 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_AUDIT_ARCH is not set CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_HAVE_INTEL_TXT=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" @@ -5771,12 +5770,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_CLKEVT_I8253=y CONFIG_I8253_LOCK=y CONFIG_CLKBLD_I8253=y -CONFIG_IOMMU_API=y -CONFIG_IOMMU_SUPPORT=y -CONFIG_DMAR_TABLE=y -CONFIG_INTEL_IOMMU=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set -CONFIG_INTEL_IOMMU_FLOPPY_WA=y +# CONFIG_IOMMU_SUPPORT is not set CONFIG_VIRT_DRIVERS=y CONFIG_HYPERV=m CONFIG_HYPERV_UTILS=m @@ -6283,7 +6277,6 @@ CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y -CONFIG_INTEL_TXT=y CONFIG_LSM_MMAP_MIN_ADDR=65536 CONFIG_SECURITY_SELINUX=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y -- 2.47.3