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: 18402 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f200.google.com (mail-ye0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 48F2E25B8B for ; Wed, 17 Jul 2013 13:26:42 +0000 (UTC) Received: by mail-ye0-f200.google.com with SMTP id r9sf2353934yen.3 for ; Wed, 17 Jul 2013 06:26:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=l8PmJd3GGP3/yctlMQnLclhjm53K6sPHLOtxKokjMG8=; b=WqVaOkn3PoPUaDz+j6u/0UThU/v2Q+D+n0CicdiY/kq0r8sdAyiuEmYRPO3mIns3SK Ej1pZD/vo4dYpp226iwq5RUrturRC0XdYVWIuIBoFZ4YcXjVwSl8jdZcCM7iUgw3hwDm 9glrrWIwikyeYKx9WnmS8aaHgYiRBhZoXhFCh+djO/c1lreGhDCDj061Qx4aHl+gLhVO qvwM9nOr3E1hXB28a89rwA8T7hLHaFZtutyQrra2vdSNnMtOK8io/Rw2rOAZHWuHePFa slnOlFfreAQVNL5tMEm05nlocI1Fj4pnqD4tTmdsiWjbA2FmmVUVT8msjXZKFBYZBt15 CZ+g== X-Received: by 10.236.91.4 with SMTP id g4mr3745264yhf.30.1374067602044; Wed, 17 Jul 2013 06:26:42 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.49.135 with SMTP id u7ls860871qen.3.gmail; Wed, 17 Jul 2013 06:26:41 -0700 (PDT) X-Received: by 10.220.225.2 with SMTP id iq2mr2039019vcb.59.1374067601958; Wed, 17 Jul 2013 06:26:41 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id ya5si1370176vec.95.2013.07.17.06.26.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Jul 2013 06:26:41 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id c13so1483478vea.35 for ; Wed, 17 Jul 2013 06:26:41 -0700 (PDT) X-Received: by 10.58.128.71 with SMTP id nm7mr2081384veb.51.1374067601858; Wed, 17 Jul 2013 06:26:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.149.77 with SMTP id s13csp172300vcv; Wed, 17 Jul 2013 06:26:37 -0700 (PDT) X-Received: by 10.180.9.242 with SMTP id d18mr15790902wib.18.1374067596636; Wed, 17 Jul 2013 06:26:36 -0700 (PDT) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mx.google.com with ESMTPS id bs9si2658684wib.36.2013.07.17.06.26.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Jul 2013 06:26:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.174 is neither permitted nor denied by best guess record for domain of steve.capper@linaro.org) client-ip=209.85.212.174; Received: by mail-wi0-f174.google.com with SMTP id k10so5401625wiv.13 for ; Wed, 17 Jul 2013 06:26:36 -0700 (PDT) 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 Cc: christoffer.dall@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, patches@linaro.org, Steve Capper 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: ALoCoQkxKC4N5t1oKgd0hHrtmTTop9jjZ5GEIF3KVWUJumChLeRN3/PnwpSHHk29AzUUmTU5RD9K X-Original-Sender: steve.capper@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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,