From patchwork Wed Jul 17 13:26:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 2828606 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A4E89C0AB2 for ; Wed, 17 Jul 2013 13:29:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BA8A2010B for ; Wed, 17 Jul 2013 13:29:26 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2564A200FF for ; Wed, 17 Jul 2013 13:29:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UzRlS-0003jx-4x; Wed, 17 Jul 2013 13:27:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UzRlC-0002p0-8F; Wed, 17 Jul 2013 13:27:14 +0000 Received: from mail-we0-f174.google.com ([74.125.82.174]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UzRkv-0002mJ-S0 for linux-arm-kernel@lists.infradead.org; Wed, 17 Jul 2013 13:26:58 +0000 Received: by mail-we0-f174.google.com with SMTP id q58so1742040wes.5 for ; Wed, 17 Jul 2013 06:26:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=l8PmJd3GGP3/yctlMQnLclhjm53K6sPHLOtxKokjMG8=; b=EcZMm3eTqp+dZBLbsZYUBndKbNeMgs1A2O2fNeQrjnuwdICFCFUcX4d7JxZJneJ2B8 rn7TSSc2Jy2IQMMRWWOSO3Dt7COBmPFAV6QJAdhsiLK2WKB9DVouHCIJ0vdeRuMFyU/n 4QV4tmJdS4sJrm7EkFgNUsEyPPPvtqCWCeg3hkgmfW7+QBAgNZPxoNHciXijLbcgfrfT f40vhJBCScjOzowUbdX/mORD8SGiGd8P4ooL8SC+Jx4QCTgUeutDLrGfIVh2PFlZDaeN il6uKWVolLta3iyZGzDzsSAQReXSZdvF7m71J8XfhDbh4wg+ULcVcpexDDfnBAl9SY5x uSWQ== X-Received: by 10.194.158.102 with SMTP id wt6mr4852039wjb.27.1374067596091; Wed, 17 Jul 2013 06:26:36 -0700 (PDT) Received: from localhost.localdomain (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id s19sm35079515wik.11.2013.07.17.06.26.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Jul 2013 06:26:35 -0700 (PDT) From: Steve Capper To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] ARM: mm: Remove HugeTLB warning from dma-mapping.c Date: Wed, 17 Jul 2013 14:26:14 +0100 Message-Id: <1374067574-32034-3-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1374067574-32034-1-git-send-email-steve.capper@linaro.org> References: <1374067574-32034-1-git-send-email-steve.capper@linaro.org> X-Gm-Message-State: ALoCoQntUYqNnhio/Tp/LCaIRwj/0oIqCUk5SfeZOWv0eKj6OESmmcdZ3dXeYKHI3HuXMpLup0Tx X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130717_092658_052628_1F18163D X-CRM114-Status: UNSURE ( 9.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Steve Capper , catalin.marinas@arm.com, will.deacon@arm.com, christoffer.dall@linaro.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The coherant DMA allocator code contained a compile time warning when HugeTLB support was enabled. It stated that huge pages were not supported by the DMA allocator. Apart from memory pressure, HugeTLB should not affect (or be affected by) the higher order pages operated on by the DMA allocator. Also, the user space mappings returned by arm_dma_mmap are done via remap_pfn_range, so the Transparent Huge Page daemon will leave them alone too. This patch removes the huge page warning from dma-mapping.c. Signed-off-by: Steve Capper --- arch/arm/mm/dma-mapping.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 7f9b179..9486048 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -249,9 +249,6 @@ static void __dma_free_buffer(struct page *page, size_t size) } #ifdef CONFIG_MMU -#ifdef CONFIG_HUGETLB_PAGE -#warning ARM Coherent DMA allocator does not (yet) support huge TLB -#endif static void *__alloc_from_contiguous(struct device *dev, size_t size, pgprot_t prot, struct page **ret_page,