summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/io.h
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-12-03 05:53:04 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-12-03 07:26:40 (GMT)
commit181de82ee3ffda1175f89d50c991dae31b79280c (patch)
treeb6b3e0a4507138ae4542f115790fe489683d7ef3 /arch/x86/include/asm/io.h
parent6083aa485c86933ee444dc2242270d37ea4664cb (diff)
downloadlinux-181de82ee3ffda1175f89d50c991dae31b79280c.tar.xz
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.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 33513b9..05cfed4 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)
#define readq readq
#define writeq writeq
-extern int iommu_bio_merge;
-
#ifdef CONFIG_X86_32
# include "io_32.h"
#else