diff options
| author | Andi Kleen <ak@suse.de> | 2005-09-12 18:49:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 10:49:56 -0700 |
| commit | 63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91 (patch) | |
| tree | 55d2286db7d2df82d75ec8046afa9d36687d7c72 /arch | |
| parent | 5d3d0f7704ed0bc7eaca0501eeae3e5da1ea6c87 (diff) | |
| download | linux-63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91.tar.gz | |
[PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and no AGP found
No-one needs it then
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/aperture.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c index c9a6b812e926c..962ad4823b6a5 100644 --- a/arch/x86_64/kernel/aperture.c +++ b/arch/x86_64/kernel/aperture.c @@ -245,6 +245,8 @@ void __init iommu_hole_init(void) if (aper_alloc) { /* Got the aperture from the AGP bridge */ + } else if (swiotlb && !valid_agp) { + /* Do nothing */ } else if ((!no_iommu && end_pfn >= 0xffffffff>>PAGE_SHIFT) || force_iommu || valid_agp || |