From a5c4fdfd7e020e0ac9beaa362a076f482f8abce8 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 2 Mar 2010 14:25:38 +0000 Subject: [PATCH] --- yaml --- r: 188823 b: refs/heads/master c: 191aee58b6568cf8143901bfa3f57a9b8faa6f1c h: refs/heads/master i: 188821: b8b37fb35951d437441c7f9cffbd22914bb3bf57 188819: 5004d9f263f0724c79edd3129d94143aa39be393 188815: b3be8b03bcd2376bf5e3a742e933fcf460125726 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 13 ------------- trunk/arch/powerpc/kernel/iommu.c | 7 +------ 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 750797e5ba04..c7251c2a5f51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a93272969c6b1d59883fcbb04845420bd72c9a20 +refs/heads/master: 191aee58b6568cf8143901bfa3f57a9b8faa6f1c diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index 8a54eb8e3768..2e19500921f9 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -313,19 +313,6 @@ config 8XX_MINIMAL_FPEMU It is recommended that you build a soft-float userspace instead. -config IOMMU_VMERGE - bool "Enable IOMMU virtual merging" - depends on PPC64 - default y - help - Cause IO segments sent to a device for DMA to be merged virtually - by the IOMMU when they happen to have been allocated contiguously. - This doesn't add pressure to the IOMMU allocator. However, some - drivers don't support getting large merged segments coming back - from *_map_sg(). - - Most drivers don't have this problem; it is safe to say Y here. - config IOMMU_HELPER def_bool PPC64 diff --git a/trunk/arch/powerpc/kernel/iommu.c b/trunk/arch/powerpc/kernel/iommu.c index 5547ae6e6b0b..ec94f906ea43 100644 --- a/trunk/arch/powerpc/kernel/iommu.c +++ b/trunk/arch/powerpc/kernel/iommu.c @@ -42,12 +42,7 @@ #define DBG(...) -#ifdef CONFIG_IOMMU_VMERGE -static int novmerge = 0; -#else -static int novmerge = 1; -#endif - +static int novmerge; static int protect4gb = 1; static void __iommu_free(struct iommu_table *, dma_addr_t, unsigned int);