git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../torvalds-2.6/
[sfrench/cifs-2.6.git]
/
arch
/
x86_64
/
kernel
/
aperture.c
diff --git
a/arch/x86_64/kernel/aperture.c
b/arch/x86_64/kernel/aperture.c
index c9a6b812e926cf3f5c79493433cda35b5c9c7e3b..962ad4823b6a567d4f340bca8d101a2e958dfbd2 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 ||