linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] x86: remove dead BIO_VMERGE_BOUNDARY definition
@ 2008-10-24  5:41 FUJITA Tomonori
  2008-10-24 20:58 ` Jeremy Fitzhardinge
                   ` (2 more replies)
  0 siblings, 3 replies; 27+ messages in thread
From: FUJITA Tomonori @ 2008-10-24  5:41 UTC (permalink / raw)
  To: linux-kernel; +Cc: mingo, jens.axboe

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>
---
 arch/x86/include/asm/io.h    |    2 --
 arch/x86/include/asm/io_64.h |    2 --
 arch/x86/kernel/pci-dma.c    |    6 ------
 3 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 5618a10..2f13dbe 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -59,8 +59,6 @@ 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/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h
index fea325a..563c162 100644
--- a/arch/x86/include/asm/io_64.h
+++ b/arch/x86/include/asm/io_64.h
@@ -232,8 +232,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c);
 
 #define flush_write_buffers()
 
-#define BIO_VMERGE_BOUNDARY iommu_bio_merge
-
 /*
  * Convert a virtual cached pointer to an uncached pointer
  */
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 1972266..d851667 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -28,11 +28,6 @@ int no_iommu __read_mostly;
 /* Set this to 1 if there is a HW IOMMU in the system */
 int iommu_detected __read_mostly = 0;
 
-/* This tells the BIO block layer to assume merging. Default to off
-   because we cannot guarantee merging later. */
-int iommu_bio_merge __read_mostly = 0;
-EXPORT_SYMBOL(iommu_bio_merge);
-
 dma_addr_t bad_dma_address __read_mostly = 0;
 EXPORT_SYMBOL(bad_dma_address);
 
@@ -186,7 +181,6 @@ static __init int iommu_setup(char *p)
 		}
 
 		if (!strncmp(p, "biomerge", 8)) {
-			iommu_bio_merge = 4096;
 			iommu_merge = 1;
 			force_iommu = 1;
 		}
-- 
1.5.4.2


^ permalink raw reply related	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2008-10-29 13:15 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-24  5:41 [PATCH] x86: remove dead BIO_VMERGE_BOUNDARY definition FUJITA Tomonori
2008-10-24 20:58 ` Jeremy Fitzhardinge
2008-10-27  4:42   ` FUJITA Tomonori
2008-10-24 20:59 ` [PATCH 1/2] bio: define __BIOVEC_PHYS_MERGEABLE Jeremy Fitzhardinge
2008-10-24 20:59 ` [PATCH 2/2] x86: replace BIO_VMERGE_BOUNDARY with BIOVEC_PHYS_MERGEABLE Jeremy Fitzhardinge
2008-10-27  3:52   ` FUJITA Tomonori
2008-10-27  8:21     ` Jeremy Fitzhardinge
2008-10-27  8:37       ` FUJITA Tomonori
2008-10-27  9:18         ` Jeremy Fitzhardinge
2008-10-27  9:36           ` FUJITA Tomonori
2008-10-27  9:41             ` Jens Axboe
2008-10-27 11:43               ` Jeremy Fitzhardinge
2008-10-27 11:57                 ` Jens Axboe
2008-10-28 23:06                   ` FUJITA Tomonori
2008-10-29  8:37                     ` Ingo Molnar
2008-10-29  9:24                       ` Jeremy Fitzhardinge
2008-10-29 10:51                         ` Ingo Molnar
2008-10-29 11:25                           ` Ingo Molnar
2008-10-29 11:27                             ` Jens Axboe
2008-10-29 11:30                               ` Ingo Molnar
2008-10-29 11:34                                 ` Jens Axboe
2008-10-29 11:55                                   ` FUJITA Tomonori
2008-10-29 12:12                                 ` Jeremy Fitzhardinge
2008-10-29 13:03                                   ` Ingo Molnar
2008-10-29 13:06                                     ` Jeremy Fitzhardinge
2008-10-29 13:06                                       ` Jens Axboe
2008-10-29  9:27                     ` Jens Axboe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).