The patch titled
use select for GART_IOMMU to enable AGP
has been removed from the -mm tree. Its filename is
x86_64-use-select-for-gart_iommu-to-enable-agp.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
The AGP default doesn't work well with other selects, so use a select for
GART_IOMMU as well. Remove a redundant default for SWIOTLB as well.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/Kconfig | 5 ++---
drivers/char/agp/Kconfig | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff -puN arch/x86_64/Kconfig~x86_64-use-select-for-gart_iommu-to-enable-agp arch/x86_64/Kconfig
--- devel/arch/x86_64/Kconfig~x86_64-use-select-for-gart_iommu-to-enable-agp 2006-04-22 01:39:32.000000000 -0700
+++ devel-akpm/arch/x86_64/Kconfig 2006-04-22 01:39:32.000000000 -0700
@@ -390,6 +390,7 @@ config GART_IOMMU
bool "K8 GART IOMMU support"
default y
select SWIOTLB
+ select AGP
depends on PCI
help
Support for hardware IOMMU in AMD's Opteron/Athlon64 Processors
@@ -420,11 +421,9 @@ config CALGARY_IOMMU
Normally the kernel will make the right choice by itself.
If unsure, say Y.
-# need this always enabled with GART_IOMMU for the VIA workaround
+# need this always selected by GART_IOMMU for the VIA workaround
config SWIOTLB
bool
- default y
- depends on GART_IOMMU
config X86_MCE
bool "Machine check support" if EMBEDDED
diff -puN drivers/char/agp/Kconfig~x86_64-use-select-for-gart_iommu-to-enable-agp drivers/char/agp/Kconfig
--- devel/drivers/char/agp/Kconfig~x86_64-use-select-for-gart_iommu-to-enable-agp 2006-04-22 01:39:32.000000000 -0700
+++ devel-akpm/drivers/char/agp/Kconfig 2006-04-22 01:39:32.000000000 -0700
@@ -1,7 +1,6 @@
config AGP
- tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+ tristate "/dev/agpgart (AGP Support)"
depends on ALPHA || IA64 || PPC || X86
- default y if GART_IOMMU
---help---
AGP (Accelerated Graphics Port) is a bus system mainly used to
connect graphics cards to the rest of the system.
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
kconfig-improve-config-load-save-output.patch
kconfig-fix-config-dependencies.patch
kconfig-remove-symbol_yesmodno.patch
kconfig-allow-multiple-default-values-per-symbol.patch
kconfig-allow-loading-multiple-configurations.patch
kconfig-integrate-split-config-into-silentoldconfig.patch
kconfig-move-kernelrelease.patch
kconfig-add-symbol-option-config-syntax.patch
kconfig-add-defconfig_list-module-option.patch
kconfig-add-search-option-for-xconfig.patch
kconfig-finer-customization-via-popup-menus.patch
kconfig-create-links-in-info-window.patch
kconfig-jump-to-linked-menu-prompt.patch
kconfig-warn-about-leading-whitespace-for-menu-prompts.patch
kconfig-remove-leading-whitespace-in-menu-prompts.patch
config-exit-if-no-beginning-filename.patch
make-kernelrelease-speedup.patch
kconfig-kconfig_overwriteconfig.patch
fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch
time-rename-clocksource-functions.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
