summaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
authorJaswinder Singh <jaswinder@infradead.org>2008-07-21 22:24:29 +0530
committerIngo Molnar <mingo@elte.hu>2008-07-22 14:36:04 +0200
commit9321b8cbbbf3a8dbd4748e3722facaeb8401bd13 (patch)
treeacc231d54b0b8746db5d3c15116568c2208f4618 /include/asm-x86
parenta7b7511ac1404eaf0e7b6c445a7c61b48ccfcf0b (diff)
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>
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/io.h2
-rw-r--r--include/asm-x86/io_64.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
index bf5d629b3a3..a145210ac16 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 ddd8058a502..1e271378afa 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
/*