From patchwork Thu Oct 10 11:06:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 20933 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 83C2225C9D for ; Thu, 10 Oct 2013 11:06:28 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id cm18sf1213942qab.8 for ; Thu, 10 Oct 2013 04:06:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state: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=IRoRvSx3zum1MJMDny5M0RzC5hYE+n2pa2ugCmC9/mc=; b=R1UgGJCUj66pcEpw3ZRAJ4BZauFZVxYdX87CPlLBHi87yl796OUmD4tLkZpReb47yd KTbraGj6Gf8tXxCAjCuCOPKhr90XfDcEzgZAGlXhZvA0+zv3URpBhZQDZQclITwmepVu 5WEBTy9vDMD524P6SwLlHaX23QzSFhju50rHpTWaDdMxbiwrgT0P2LAlbKmyD6IeZSWs 2mM6ouuFc0xFTkmXtle/nDeTCBdZlfXcjigqNHa0gkMpTD3roSXDDYpeeFQwG4hI56Pq gZ0KN7Z8u//FLfpeSchElj3IVwY20b2DDcop0sah86AcPDTnUxlgboSvbvEs6BUnuxb+ uryQ== X-Received: by 10.236.145.34 with SMTP id o22mr11455207yhj.22.1381403187715; Thu, 10 Oct 2013 04:06:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.95.161 with SMTP id dl1ls992523qeb.60.gmail; Thu, 10 Oct 2013 04:06:27 -0700 (PDT) X-Received: by 10.52.244.34 with SMTP id xd2mr4728950vdc.87.1381403187530; Thu, 10 Oct 2013 04:06:27 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id fx4si13992273vdc.26.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 04:06:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 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.175; Received: by mail-vc0-f175.google.com with SMTP id ia6so475515vcb.6 for ; Thu, 10 Oct 2013 04:06:27 -0700 (PDT) X-Gm-Message-State: ALoCoQlMv/ENhaYWTn2YB714sfD8gg2RtoQZg8LmkxeOeAd9+jL6HvMEg0fLBcD4gR22pnHtxDGH X-Received: by 10.220.50.10 with SMTP id x10mr5485785vcf.86.1381403187401; Thu, 10 Oct 2013 04:06:27 -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.174.196 with SMTP id u4csp365780vcz; Thu, 10 Oct 2013 04:06:26 -0700 (PDT) X-Received: by 10.180.93.8 with SMTP id cq8mr7128402wib.38.1381403185352; Thu, 10 Oct 2013 04:06:25 -0700 (PDT) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by mx.google.com with ESMTPS id fw4si18252039wjb.97.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 04:06:25 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.53 is neither permitted nor denied by best guess record for domain of steve.capper@linaro.org) client-ip=74.125.82.53; Received: by mail-wg0-f53.google.com with SMTP id y10so417326wgg.8 for ; Thu, 10 Oct 2013 04:06:24 -0700 (PDT) X-Received: by 10.180.187.236 with SMTP id fv12mr7295117wic.20.1381403184807; Thu, 10 Oct 2013 04:06:24 -0700 (PDT) Received: from marmot.wormnet.eu (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id gp9sm24374288wib.8.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Oct 2013 04:06:24 -0700 (PDT) From: Steve Capper To: linux-arm-kernel@lists.infradead.org Cc: linux@arm.linux.org.uk, linaro-kernel@lists.linaro.org, patches@linaro.org, maxim.uvarov@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, Steve Capper Subject: [RESEND PATCH] ARM: mm: Remove HugeTLB warning from dma-mapping.c Date: Thu, 10 Oct 2013 12:06:18 +0100 Message-Id: <1381403178-32061-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.175 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 --- Hi, I'm resending this patch as it appears to have slipped through the cracks. Without this patch we will get spurious compiler warnings when building kernels with huge page support. Cheers, 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,