x86: pci-dma.c declare iommu_bio_merge before they get used

moved iommu_bio_merge from io_64.h to io.h because it is required for both. Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>
git-mirror · Jul 22, 2008 · 9321b8c · 9321b8c
1 parent a7b7511
commit 9321b8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     /*
@@ Expand Down @@