2008-12-03 05:57:40

by FUJITA Tomonori

Subject: [RESEND] [PATCH] x86: remove dead BIO_VMERGE_BOUNDARY definition

This is for 2.6.29 (against tip/master), a resend of:

http://marc.info/?l=linux-kernel&m=122482703716620&w=2

=
From: FUJITA Tomonori <[email protected]>
Subject: [PATCH] x86: remove dead BIO_VMERGE_BOUNDARY definition

The block layer dropped the virtual merge feature
(b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). BIO_VMERGE_BOUNDARY
definition is meaningless now.

Signed-off-by: FUJITA Tomonori <[email protected]>
Acked-by: Jens Axboe <[email protected]>
---
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 33513b9..05cfed4 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -80,8 +80,6 @@ static inline void writeq(__u64 val, volatile void __iomem *addr)
#define readq readq
#define writeq writeq

-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 12eeb4b..da93c65 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -31,11 +31,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);

@@ -189,7 +184,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.5.GIT

2008-12-03 07:24:50

by Ingo Molnar

Subject: Re: [RESEND] [PATCH] x86: remove dead BIO_VMERGE_BOUNDARY definition

* FUJITA Tomonori <[email protected]> wrote:

> This is for 2.6.29 (against tip/master), a resend of:
>
> http://marc.info/?l=linux-kernel&m=122482703716620&w=2
>
> =
> From: FUJITA Tomonori <[email protected]>
> Subject: [PATCH] x86: remove dead BIO_VMERGE_BOUNDARY definition
>
> The block layer dropped the virtual merge feature
> (b8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5). BIO_VMERGE_BOUNDARY
> definition is meaningless now.

ok - for the previous submission there was some discussion about
what the dependencies of this cleanup are, so it got skipped.
Looks good.

> Signed-off-by: FUJITA Tomonori <[email protected]>
> Acked-by: Jens Axboe <[email protected]>
> ---
> 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(-)

applied to tip/x86/iommu, thanks!

Ingo