diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-13 18:18:00 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-13 18:18:00 +0100 |
| commit | ba6c548701ef7a93b9ea05d1506d2b62f1628333 (patch) | |
| tree | da91ea24ed01a4c0214b743fe7dfd01344f1fbcb /arch/ia64/kernel/pci-swiotlb.c | |
| parent | 5fe60f4e5871b64e687229199fafd4ef13cd0886 (diff) | |
| download | blackbird-op-linux-ba6c548701ef7a93b9ea05d1506d2b62f1628333.tar.gz blackbird-op-linux-ba6c548701ef7a93b9ea05d1506d2b62f1628333.zip | |
ia64: IOMMU passthrough mode shouldn't trigger swiotlb init
Since commit 19943b0e30b05d42e494ae6fef78156ebc8c637e ('intel-iommu:
Unify hardware and software passthrough support'), hardware passthrough
mode will do the same as software passthrough mode was doing -- it'll
still use the IOMMU normally for devices which can't address all of
memory. This means that we don't need to bother with swiotlb.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/ia64/kernel/pci-swiotlb.c')
| -rw-r--r-- | arch/ia64/kernel/pci-swiotlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c index 223abb134105..285aae8431c6 100644 --- a/arch/ia64/kernel/pci-swiotlb.c +++ b/arch/ia64/kernel/pci-swiotlb.c @@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void) void __init pci_swiotlb_init(void) { - if (!iommu_detected || iommu_pass_through) { + if (!iommu_detected) { #ifdef CONFIG_IA64_GENERIC swiotlb = 1; printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n"); |
