diff options
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 12eeb4bfcdeb..da93c65f8f0b 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -31,11 +31,6 @@ int no_iommu __read_mostly; | |||
| 31 | /* Set this to 1 if there is a HW IOMMU in the system */ | 31 | /* Set this to 1 if there is a HW IOMMU in the system */ |
| 32 | int iommu_detected __read_mostly = 0; | 32 | int iommu_detected __read_mostly = 0; |
| 33 | 33 | ||
| 34 | /* This tells the BIO block layer to assume merging. Default to off | ||
| 35 | because we cannot guarantee merging later. */ | ||
| 36 | int iommu_bio_merge __read_mostly = 0; | ||
| 37 | EXPORT_SYMBOL(iommu_bio_merge); | ||
| 38 | |||
| 39 | dma_addr_t bad_dma_address __read_mostly = 0; | 34 | dma_addr_t bad_dma_address __read_mostly = 0; |
| 40 | EXPORT_SYMBOL(bad_dma_address); | 35 | EXPORT_SYMBOL(bad_dma_address); |
| 41 | 36 | ||
| @@ -189,7 +184,6 @@ static __init int iommu_setup(char *p) | |||
| 189 | } | 184 | } |
| 190 | 185 | ||
| 191 | if (!strncmp(p, "biomerge", 8)) { | 186 | if (!strncmp(p, "biomerge", 8)) { |
| 192 | iommu_bio_merge = 4096; | ||
| 193 | iommu_merge = 1; | 187 | iommu_merge = 1; |
| 194 | force_iommu = 1; | 188 | force_iommu = 1; |
| 195 | } | 189 | } |
