OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d3d0f7
)
[PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and no AGP found
author
Andi Kleen
<ak@suse.de>
Mon, 12 Sep 2005 16:49:24 +0000
(18:49 +0200)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 12 Sep 2005 17:49:56 +0000
(10:49 -0700)
No-one needs it then
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/x86_64/kernel/aperture.c
patch
|
blob
|
history
diff --git
a/arch/x86_64/kernel/aperture.c
b/arch/x86_64/kernel/aperture.c
index
c9a6b81
..
962ad48
100644
(file)
--- 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 ||