diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-12-03 00:53:04 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 02:26:40 -0500 |
commit | 181de82ee3ffda1175f89d50c991dae31b79280c (patch) | |
tree | b6b3e0a4507138ae4542f115790fe489683d7ef3 /arch/x86/include/asm/io.h | |
parent | 6083aa485c86933ee444dc2242270d37ea4664cb (diff) |
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/include/asm/io.h')
-rw-r--r-- | arch/x86/include/asm/io.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 33513b9a67f3..05cfed4485fa 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h | |||
@@ -80,8 +80,6 @@ static inline void writeq(__u64 val, volatile void __iomem *addr) | |||
80 | #define readq readq | 80 | #define readq readq |
81 | #define writeq writeq | 81 | #define writeq writeq |
82 | 82 | ||
83 | extern int iommu_bio_merge; | ||
84 | |||
85 | #ifdef CONFIG_X86_32 | 83 | #ifdef CONFIG_X86_32 |
86 | # include "io_32.h" | 84 | # include "io_32.h" |
87 | #else | 85 | #else |