diff options
| author |   FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-01-04 16:16:23 +0900 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2010-01-13 11:15:37 +0100 |
| commit | 42590a75019a50012f25a962246498dead428433 (patch) | |
| tree | f248821c7f38d988e2d03ddaaa7c63c59e0e3206 /arch/x86 | |
| parent | x86: SGI UV: Fix mapping of MMIO registers (diff) | |
| download | linux-dev-42590a75019a50012f25a962246498dead428433.tar.xz linux-dev-42590a75019a50012f25a962246498dead428433.zip | |
x86/agp: Fix agp_amd64_init and agp_amd64_cleanup
This fixes the regression introduced by the commit
f405d2c02395a74d3883bd03ded36457aa3697ad.
The above commit fixes the following issue:
http://marc.info/?l=linux-kernel&m=126192729110083&w=2
However, it doesn't work properly when you remove and insert the
agp_amd64 module again.
agp_amd64_init() and agp_amd64_cleanup should be called only
when gart_iommu is not called earlier (that is, the GART IOMMU
is not enabled). We need to use 'gart_iommu_aperture' to see if
GART IOMMU is enabled or not.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: mitov@issp.bas.bg
Cc: davej@redhat.com
LKML-Reference: <20100104161603L.fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/aperture_64.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index 3704997e8b25..f147a95fd84a 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c @@ -31,6 +31,7 @@ #include <asm/x86_init.h> int gart_iommu_aperture; +EXPORT_SYMBOL_GPL(gart_iommu_aperture); int gart_iommu_aperture_disabled __initdata; int gart_iommu_aperture_allowed __initdata; |