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.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
pci-swiotlb.c
diff --git
a/arch/x86_64/kernel/pci-swiotlb.c
b/arch/x86_64/kernel/pci-swiotlb.c
index
990ed67
..
ebdb77f
100644
(file)
--- a/
arch/x86_64/kernel/pci-swiotlb.c
+++ b/
arch/x86_64/kernel/pci-swiotlb.c
@@
-31,7
+31,7
@@
struct dma_mapping_ops swiotlb_dma_ops = {
void pci_swiotlb_init(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
void pci_swiotlb_init(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
- if (!iommu_
aperture
&& !no_iommu &&
+ if (!iommu_
detected
&& !no_iommu &&
(end_pfn > MAX_DMA32_PFN || force_iommu))
swiotlb = 1;
if (swiotlb) {
(end_pfn > MAX_DMA32_PFN || force_iommu))
swiotlb = 1;
if (swiotlb) {