diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:27 +0100 |
| commit | 3e5621edb3392b28efb260ac99b2d26fb8b44e73 (patch) | |
| tree | 6d26f08661344d6f17271b287a4a89b9b85a9222 /arch/x86/kernel/pci-dma.c | |
| parent | Merge branch 'x86/tsc' into x86/core (diff) | |
| parent | x86: remove dead BIO_VMERGE_BOUNDARY definition (diff) | |
| download | linux-dev-3e5621edb3392b28efb260ac99b2d26fb8b44e73.tar.xz linux-dev-3e5621edb3392b28efb260ac99b2d26fb8b44e73.zip | |
Merge branch 'x86/iommu' into x86/core
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index dc572994703d..7a3dfceb90e4 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -6,6 +6,7 @@ #include <asm/proto.h> #include <asm/dma.h> #include <asm/iommu.h> +#include <asm/gart.h> #include <asm/calgary.h> #include <asm/amd_iommu.h> @@ -30,11 +31,6 @@ int no_iommu __read_mostly; /* Set this to 1 if there is a HW IOMMU in the system */ int iommu_detected __read_mostly = 0; -/* This tells the BIO block layer to assume merging. Default to off - because we cannot guarantee merging later. */ -int iommu_bio_merge __read_mostly = 0; -EXPORT_SYMBOL(iommu_bio_merge); - dma_addr_t bad_dma_address __read_mostly = 0; EXPORT_SYMBOL(bad_dma_address); @@ -188,7 +184,6 @@ static __init int iommu_setup(char *p) } if (!strncmp(p, "biomerge", 8)) { - iommu_bio_merge = 4096; iommu_merge = 1; force_iommu = 1; } |