From patchwork Tue Jan 24 12:26:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 137540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 3C4D9B6F6F for ; Tue, 24 Jan 2012 23:26:31 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RpfS5-0005N8-Qp; Tue, 24 Jan 2012 12:26:17 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RpfS3-0005MK-Ob for kernel-team@lists.ubuntu.com; Tue, 24 Jan 2012 12:26:15 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RpfS3-0001Ms-Kq for kernel-team@lists.ubuntu.com; Tue, 24 Jan 2012 12:26:15 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] Revert "workaround cma highmem broken" Date: Tue, 24 Jan 2012 13:26:12 +0100 Message-Id: <1327407973-6753-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1327407973-6753-1-git-send-email-paolo.pisati@canonical.com> References: <1327407973-6753-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This reverts commit dce4ad0eabf45def016d0bf47c000320fa9de6a9. Signed-off-by: Paolo Pisati --- arch/arm/mach-omap2/Kconfig | 1 - arch/arm/mach-omap2/board-4430sdp.c | 3 --- arch/arm/mach-omap2/board-omap4panda.c | 3 --- arch/arm/mm/dma-mapping.c | 4 ---- 4 files changed, 0 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index fe013c5..7bac6ae 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -52,7 +52,6 @@ config ARCH_OMAP4 select USB_ARCH_HAS_EHCI select ARM_CPU_SUSPEND if PM select ARCH_HAS_BARRIERS - select ZONE_DMA comment "OMAP Core Type" depends on ARCH_OMAP2 diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 2b06e6c..eed6d40 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -1210,7 +1210,4 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") .init_machine = omap_4430sdp_init, .timer = &omap4_timer, .restart = omap_prcm_restart, -#ifdef CONFIG_ZONE_DMA - .dma_zone_size = 500 * 1024 * 1024, -#endif MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 8086266..035d56f 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -819,7 +819,4 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") .timer = &omap4_timer, .restart = omap_prcm_restart, .dt_compat = omap4_panda_match, -#ifdef CONFIG_ZONE_DMA - .dma_zone_size = 500 * 1024 * 1024, -#endif MACHINE_END diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 9c05132..6f1fa3e 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -503,14 +503,10 @@ static void *__alloc_from_contiguous(struct device *dev, size_t size, size_t count = size >> PAGE_SHIFT; struct page *page; - pr_err("__alloc_from_contiguous: count=%lu, order=%lu\n", (unsigned long)count, order); - page = dma_alloc_from_contiguous(dev, count, order); if (!page) return NULL; - pr_err("__alloc_from_contiguous: page=%p, size=%lu\n", page, (unsigned long)size); - __dma_clear_buffer(page, size); __dma_remap(page, size, prot);