diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-03 14:53:04 +0900 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 08:26:40 +0100 |
| commit | 181de82ee3ffda1175f89d50c991dae31b79280c (patch) | |
| tree | b6b3e0a4507138ae4542f115790fe489683d7ef3 /arch/x86/kernel/pci-dma.c | |
| parent | 6083aa485c86933ee444dc2242270d37ea4664cb (diff) | |
| download | linux-181de82ee3ffda1175f89d50c991dae31b79280c.tar.gz linux-181de82ee3ffda1175f89d50c991dae31b79280c.tar.bz2 linux-181de82ee3ffda1175f89d50c991dae31b79280c.zip | |
x86: remove dead BIO_VMERGE_BOUNDARY definition
Impact: cleanup, remove dead code
The block layer dropped the virtual merge feature
(b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5).
BIO_VMERGE_BOUNDARY definition is meaningless now.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; /* 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); @@ -189,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; } |