x86: remove dead BIO_VMERGE_BOUNDARY definition
Impact: cleanup, remove dead code
The block layer dropped the virtual merge feature
(b8b3e16cfe
).
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>
This commit is contained in:
parent
6083aa485c
commit
181de82ee3
3 changed files with 0 additions and 10 deletions
|
@ -80,8 +80,6 @@ static inline void writeq(__u64 val, volatile void __iomem *addr)
|
||||||
#define readq readq
|
#define readq readq
|
||||||
#define writeq writeq
|
#define writeq writeq
|
||||||
|
|
||||||
extern int iommu_bio_merge;
|
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
#ifdef CONFIG_X86_32
|
||||||
# include "io_32.h"
|
# include "io_32.h"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -232,8 +232,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c);
|
||||||
|
|
||||||
#define flush_write_buffers()
|
#define flush_write_buffers()
|
||||||
|
|
||||||
#define BIO_VMERGE_BOUNDARY iommu_bio_merge
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Convert a virtual cached pointer to an uncached pointer
|
* Convert a virtual cached pointer to an uncached pointer
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -31,11 +31,6 @@ int no_iommu __read_mostly;
|
||||||
/* Set this to 1 if there is a HW IOMMU in the system */
|
/* Set this to 1 if there is a HW IOMMU in the system */
|
||||||
int iommu_detected __read_mostly = 0;
|
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;
|
dma_addr_t bad_dma_address __read_mostly = 0;
|
||||||
EXPORT_SYMBOL(bad_dma_address);
|
EXPORT_SYMBOL(bad_dma_address);
|
||||||
|
|
||||||
|
@ -189,7 +184,6 @@ static __init int iommu_setup(char *p)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strncmp(p, "biomerge", 8)) {
|
if (!strncmp(p, "biomerge", 8)) {
|
||||||
iommu_bio_merge = 4096;
|
|
||||||
iommu_merge = 1;
|
iommu_merge = 1;
|
||||||
force_iommu = 1;
|
force_iommu = 1;
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue