git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
pci-swiotlb.c
diff --git
a/arch/x86/kernel/pci-swiotlb.c
b/arch/x86/kernel/pci-swiotlb.c
index
a1712f2
..
6af96ee
100644
(file)
--- a/
arch/x86/kernel/pci-swiotlb.c
+++ b/
arch/x86/kernel/pci-swiotlb.c
@@
-71,7
+71,8
@@
void __init pci_swiotlb_init(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
#ifdef CONFIG_X86_64
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
#ifdef CONFIG_X86_64
- if (!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN)
+ if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
+ iommu_pass_through)
swiotlb = 1;
#endif
if (swiotlb_force)
swiotlb = 1;
#endif
if (swiotlb_force)