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: 3015381 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 05A4BBF924 for ; Thu, 10 Oct 2013 11:06:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D659B20303 for ; Thu, 10 Oct 2013 11:06:57 +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 75ECC202FF for ; Thu, 10 Oct 2013 11:06:56 +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 1VUE4z-0000p7-0U; Thu, 10 Oct 2013 11:06:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VUE4w-0001VH-6D; Thu, 10 Oct 2013 11:06:50 +0000 Received: from mail-wi0-f170.google.com ([209.85.212.170]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VUE4s-0001Ub-Td for linux-arm-kernel@lists.infradead.org; Thu, 10 Oct 2013 11:06:47 +0000 Received: by mail-wi0-f170.google.com with SMTP id l12so2913987wiv.3 for ; Thu, 10 Oct 2013 04:06:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IRoRvSx3zum1MJMDny5M0RzC5hYE+n2pa2ugCmC9/mc=; b=XK1O7hlfUo5cuzJ5zMpRmxrnC96PDgAt6SJDyR+UNMpWcQK1FzWW8lkTHHCuAeHgxK ozG1uAlEbk36K4fLcPhvRYzfQXhEUovDI5Q4qge6MlFB2bysFSP6idjpyuRonSuzIyCO gFngSQC05wawspmgv5GWbq2atoS2dbPYS0pZLWitoTjGHTSAhQ3KeO1rXjHalxh6sTPN 1Trf31I3+EUYdNULDQFkAt5jSfLE7XKglRGcFnraDTJ89vWSn1SPSfzDQ+Cw3W1an/t6 2e9hfqGYwrq/zc9h0P4WHgzNDHSAcVT/23o3E7mO8PXo4qMJck95sXs+bNbWimeGnO81 TpRA== X-Gm-Message-State: ALoCoQnGcQyT2oz2bMYO4d6ZKVn/RIiE9/pI6PvRuW8HLYRb9Voz5J2GckKEobC10VdzmBIPYkwD 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131010_070647_060090_04A2F0E6 X-CRM114-Status: GOOD ( 10.98 ) X-Spam-Score: -2.6 (--) Cc: linaro-kernel@lists.linaro.org, linux@arm.linux.org.uk, patches@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, maxim.uvarov@linaro.org, Steve Capper 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.4 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 --- 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,