From afddb80fc60a3bc84da1422979f42a782db23cce Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Date: Mon, 21 Jul 2008 22:24:29 +0530 Subject: [PATCH] --- yaml --- r: 110290 b: refs/heads/master c: 9321b8cbbbf3a8dbd4748e3722facaeb8401bd13 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86/io.h | 2 ++ trunk/include/asm-x86/io_64.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7a333246f186..e012eefaf922 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7b7511ac1404eaf0e7b6c445a7c61b48ccfcf0b +refs/heads/master: 9321b8cbbbf3a8dbd4748e3722facaeb8401bd13 diff --git a/trunk/include/asm-x86/io.h b/trunk/include/asm-x86/io.h index bf5d629b3a39..a145210ac16b 100644 --- a/trunk/include/asm-x86/io.h +++ b/trunk/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/trunk/include/asm-x86/io_64.h b/trunk/include/asm-x86/io_64.h index ddd8058a5026..1e271378afaf 100644 --- a/trunk/include/asm-x86/io_64.h +++ b/trunk/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 /*