From patchwork Wed Aug 14 23:22:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 2844903 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B1B8A9F239 for ; Wed, 14 Aug 2013 23:23:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A793206D9 for ; Wed, 14 Aug 2013 23:23:12 +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 ABE0A206D7 for ; Wed, 14 Aug 2013 23:23:11 +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 1V9kPC-0000Tc-MK; Wed, 14 Aug 2013 23:23:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9kPA-0001Y8-0N; Wed, 14 Aug 2013 23:23:04 +0000 Received: from mail-oa0-x236.google.com ([2607:f8b0:4003:c02::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V9kP7-0001Wi-C3 for linux-arm-kernel@lists.infradead.org; Wed, 14 Aug 2013 23:23:02 +0000 Received: by mail-oa0-f54.google.com with SMTP id o6so78426oag.41 for ; Wed, 14 Aug 2013 16:22:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=FppNkdi9YwouFdq9RlGtt2XOyS55Whx1Sh7Ui3menxg=; b=KBqp1XS3Ff/2Mr1FymhQPvSeNWONswD1y5sugv7ECB1lSH5LYWQ794N5Gcb0p3Q/Sb szp3gJPVyQxLqd14Gj9v49wLjadhlgOCz/ZIpeerQNTeCCEg85HldN5GRs24eKf8KdZD 9kOtuENw5mQ0K+Wg3r604RV/GCvNbAjpeNuzul8zP4PH21fHl7LSbSjVWWdW4cpnd6M8 uXcMm7jtyQNhJhq/dobhd4Jwu39sifY6wudS15VG2WPQGnhQvEuKkReK+Dt4P5O9NbTz dCHjfkTPt0PaBKkFDwZ9ba0p3cRGFpmFpNHETz5rthDGMdXrlJaSBifrKYfFA3sf1Cwz +bcQ== X-Received: by 10.182.242.37 with SMTP id wn5mr9061586obc.56.1376522560179; Wed, 14 Aug 2013 16:22:40 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPSA id g1sm49685844oeq.6.2013.08.14.16.22.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Aug 2013 16:22:39 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: highbank: make dma_zone_size depend on ARM_LPAE Date: Wed, 14 Aug 2013 18:22:32 -0500 Message-Id: <1376522552-11650-1-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.8.1.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130814_192301_583684_18C7B52B X-CRM114-Status: UNSURE ( 9.77 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.8 (-) Cc: arm@kernel.org, Rob Herring 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=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Rob Herring DMA zone on highbank should only be enabled for LPAE, but other platforms can cause DMA zone to be selected resulting in this warning: arch/arm/mach-highbank/highbank.c:180:2: warning: large integer implicitly truncated to unsigned type [-Woverflow] Fix this by making dma_zone_size setting also depend on CONFIG_ARM_LPAE. Reported-by: Olof Johansson Signed-off-by: Rob Herring --- arch/arm/mach-highbank/highbank.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index b5d0375..8dc5f98 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -178,7 +178,7 @@ static const char *highbank_match[] __initconst = { }; DT_MACHINE_START(HIGHBANK, "Highbank") -#ifdef CONFIG_ZONE_DMA +#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE) .dma_zone_size = (4ULL * SZ_1G), #endif .smp = smp_ops(highbank_smp_ops),