From patchwork Thu Jan 16 10:07:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 23258 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A028C203C4 for ; Thu, 16 Jan 2014 10:08:08 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id a41sf5037114yho.4 for ; Thu, 16 Jan 2014 02:08:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=2mWFQ6t8Gm4Gyo7OetiYTjPvQb1Q1CEGYTp7BAUom3I=; b=WERTTTuvoYfgTNZgr4V5yrffSDeZEbmf0Mwz9bIlsEBQUecN0rsF3nnEsCPFQ0ZJYi NBkkirtYhhcKW9TaHptvgxFC5t6wZwViTwfF2TKA3apgjBkng3k4Yq4JOfX+/Px3gHtQ b+Kbn5RLS8vsJvIQqZKw0sqB8QOU0le9DY/iGWaCPLaNsM6fyjnXu6QGh1mZ94k1q1Y1 HlSr94oL79C6uiXHBxoGJ3Y3JL5AtS6z3tUwRX7rZJ2VMGklETl6PDhJN2WmOxCgjbHP AjmCZDX+Y6aVn0BBObwkeh2uSFo15KFTYLy8x50XjNIq8FiPxNttFIvHWp7B+bjiZMs6 2wuQ== X-Gm-Message-State: ALoCoQlFIxpGLPeI1GvlemqReJnzUecooAk4ZoXjPSaTWKcc5IXYSmeitXKCHL5TueiNz0kuT7bq X-Received: by 10.58.186.202 with SMTP id fm10mr2781407vec.37.1389866887702; Thu, 16 Jan 2014 02:08:07 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.83.2 with SMTP id m2ls854760qey.37.gmail; Thu, 16 Jan 2014 02:08:07 -0800 (PST) X-Received: by 10.220.192.198 with SMTP id dr6mr1387924vcb.26.1389866887626; Thu, 16 Jan 2014 02:08:07 -0800 (PST) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id sz9si3118039vdc.97.2014.01.16.02.08.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 02:08:07 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id hu8so895237vcb.29 for ; Thu, 16 Jan 2014 02:08:07 -0800 (PST) X-Received: by 10.58.37.67 with SMTP id w3mr1730939vej.22.1389866887328; Thu, 16 Jan 2014 02:08:07 -0800 (PST) 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.59.13.131 with SMTP id ey3csp335270ved; Thu, 16 Jan 2014 02:08:05 -0800 (PST) X-Received: by 10.194.219.1 with SMTP id pk1mr7485332wjc.36.1389866885332; Thu, 16 Jan 2014 02:08:05 -0800 (PST) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by mx.google.com with ESMTPS id uk10si5388813wjc.165.2014.01.16.02.08.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 02:08:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.182 is neither permitted nor denied by best guess record for domain of steve.capper@linaro.org) client-ip=209.85.212.182; Received: by mail-wi0-f182.google.com with SMTP id ex4so3405157wid.9 for ; Thu, 16 Jan 2014 02:08:04 -0800 (PST) X-Received: by 10.181.5.133 with SMTP id cm5mr7039353wid.59.1389866884694; Thu, 16 Jan 2014 02:08:04 -0800 (PST) Received: from marmot.wormnet.eu (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id v7sm32748751wix.5.2014.01.16.02.08.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jan 2014 02:08:04 -0800 (PST) From: Steve Capper To: linux@arm.linux.org.uk Cc: linux-arm-kernel@lists.infradead.org, will.deacon@arm.com, nicolas.pitre@linaro.org, patches@linaro.org, kim.phillips@linaro.org, Steve Capper Subject: [PATCH V2] arm: mm: Remove hugetlb warning from Coherent DMA allocator Date: Thu, 16 Jan 2014 10:07:43 +0000 Message-Id: <1389866863-24460-1-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: steve.capper@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 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 allocates pages of high order then splits them up into smaller pages. This splitting logic would run into problems if the allocator was given compound pages. Thus the Coherant DMA allocator was originally incompatible with compound pages existing and, by extension, huge pages. A compile #error was put in place whenever huge pages were enabled. Compatibility with compound pages has since been introduced by the following commit (which merely excludes GFP_COMP pages from being requested by the coherant DMA allocator): ea2e705 ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocations When huge page support was introduced to ARM, the compile #error in dma-mapping.c was replaced by a #warning when it should have been removed instead. This patch removes the compile #warning in dma-mapping.c when huge pages are enabled. Signed-off-by: Steve Capper --- Changed in V2: commit message completely re-written to give a better justification. --- 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 f61a570..8edd1b5 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -284,9 +284,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,