The patch titled
x86_64: use select for GART_IOMMU to enable AGP
has been added to the -mm tree. Its filename is
x86_64-use-select-for-gart_iommu-to-enable-agp.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: use select for GART_IOMMU to enable AGP
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>
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Dave Jones <davej@xxxxxxxxxxxxxxxxx>
Cc: Dave Airlie <airlied@xxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
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
--- 25/arch/x86_64/Kconfig~x86_64-use-select-for-gart_iommu-to-enable-agp Thu Jun 22 14:26:19 2006
+++ 25-akpm/arch/x86_64/Kconfig Thu Jun 22 14:26:19 2006
@@ -389,6 +389,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
@@ -401,11 +402,9 @@ config GART_IOMMU
northbridge and a software emulation used on other systems without
hardware IOMMU. 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
--- 25/drivers/char/agp/Kconfig~x86_64-use-select-for-gart_iommu-to-enable-agp Thu Jun 22 14:26:19 2006
+++ 25-akpm/drivers/char/agp/Kconfig Thu Jun 22 14:26:19 2006
@@ -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
x86_64-use-select-for-gart_iommu-to-enable-agp.patch
git-kbuild.patch
fix-__range_ok-constraint.patch
m68k-completely-initialize-hw_regs_t-in-ide_setup_ports.patch
m68k-atyfb_base-compile-fix-for-config_pci=n.patch
m68k-cleanup-unistdh.patch
m68k-remove-some-unused-definitions-in-zorroh.patch
m68k-use-c99-initializer.patch
m68k-print-correct-stack-trace.patch
m68k-restore-amikbd-compatibility-with-24.patch
m68k-extra-delay.patch
m68k-use-proper-defines-for-zone-initialization.patch
m68k-adjust-to-changed-hardirq_mask.patch
m68k-m68k-mac-via2-fixes-and-cleanups.patch
m68k-clean-up-uaccessh.patch
m68k-trapsc-constraints.patch
m68k-windfarm-is-powerpc-only-dont-do-it-on-m68k-macs.patch
fix-incorrect-sa_onstack-behaviour-for-64-bit-processes.patch
adjust-handle_irr_event-return-type.patch
affs_fill_super-%s-abuses-2.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-rt-mutex-defaults-and-dependencies.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
