diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
index bf5d629b3a39a369256564db15ba2d66eb4a014a..a145210ac16b7ae20c5c23dc511c01c72fe0e32d 100644
--- a/include/asm-x86/io.h
+++ b/include/asm-x86/io.h
@@ -73,6 +73,8 @@ build_mmio_write(__writeq, "q", unsigned long, "r", )
 #define writeq writeq
 #endif
 
+extern int iommu_bio_merge;
+
 #ifdef CONFIG_X86_32
 # include "io_32.h"
 #else
diff --git a/include/asm-x86/io_64.h b/include/asm-x86/io_64.h
index ddd8058a50267766cb398984220462589ee6d362..1e271378afafca5d143235c245ba8e67f4f94d19 100644
--- a/include/asm-x86/io_64.h
+++ b/include/asm-x86/io_64.h
@@ -233,7 +233,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c);
 
 #define flush_write_buffers()
 
-extern int iommu_bio_merge;
 #define BIO_VMERGE_BOUNDARY iommu_bio_merge
 
 /*