From patchwork Thu Oct 16 09:41:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifan Zhang X-Patchwork-Id: 5089641 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 28D1A9F2BA for ; Thu, 16 Oct 2014 09:43:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B5B520154 for ; Thu, 16 Oct 2014 09:43:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7A85420127 for ; Thu, 16 Oct 2014 09:43:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XehYl-000710-0P; Thu, 16 Oct 2014 09:41:27 +0000 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XehYh-0006tp-CY for linux-arm-kernel@lists.infradead.org; Thu, 16 Oct 2014 09:41:24 +0000 Received: by mail-wi0-f181.google.com with SMTP id hi2so4195553wib.8 for ; Thu, 16 Oct 2014 02:41:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=bBzEOzk/x68khlLY90GTv4sJLdGQwc98HUeIX0gqjDY=; b=BAbFim3+GFLexbCZlbwhJNDQ3s0BycYZvkMPDWxtnXjYExQJGZvYx3B9y9VFYsN65K bpy4ypeX+Qcj8gMAq8rRB9r0lt4T9MWRz69afw+uUvI7CqQ4Vxxn9lmY6hjh5WzVj9zR IWMLEf4ID9a1lePzKUsk210fuo1NkiEn7XC2kejuPZAAYfOhqe3vT3QNU+1EG0Uy8GvO vItSKCwHVkRzmu8UJf9CglrwxgBS9mH8VX9+85uTsQ0r7HpcYQ1YrA6NZD246O2Yxwba E3IeVrxKKTnVXeTCPJWImkxJMkejaduKr1ym1uFQilP/E7+YZKTKDeS6xhfvf9PBeEP8 hZnw== MIME-Version: 1.0 X-Received: by 10.180.74.198 with SMTP id w6mr4303281wiv.47.1413452461397; Thu, 16 Oct 2014 02:41:01 -0700 (PDT) Received: by 10.194.143.5 with HTTP; Thu, 16 Oct 2014 02:41:01 -0700 (PDT) Date: Thu, 16 Oct 2014 17:41:01 +0800 Message-ID: Subject: [PATCH v2] arm64: mm: use macro instead of if judgement of ZONE_DMA From: Yifan Zhang To: Catalin Marinas , Will Deacon , mark.rutland@arm.com, lauraa@codeaurora.org, ganapatrao.kulkarni@caviumnetworks.com, robh@kernel.org, leif.lindholm@linaro.org, Yalin.Wang@sonymobile.com, "linux-arm-kernel@lists.infradead.org" , linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141016_024123_575142_1F37A4CF X-CRM114-Status: GOOD ( 11.95 ) X-Spam-Score: -0.8 (/) Cc: Yifan Zhang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no 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 if disable CONFIG_ZONE_DMA, ZONE_DMA becomes undefined. Signed-off-by: Yifan Zhang --- arch/arm64/mm/init.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) memcpy(zhole_size, zone_size, sizeof(zhole_size)); @@ -97,10 +97,12 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) if (start >= max) continue; - if (IS_ENABLED(CONFIG_ZONE_DMA) && start < max_dma) { +#ifdef CONFIG_ZONE_DMA + if (start < max_dma) { unsigned long dma_end = min(end, max_dma); zhole_size[ZONE_DMA] -= dma_end - start; } +#endif if (end > max_dma) { unsigned long normal_end = min(end, max); -- 1.7.9.5 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 494297c..887ca5d 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -82,10 +82,10 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) memset(zone_size, 0, sizeof(zone_size)); /* 4GB maximum for 32-bit only capable devices */ - if (IS_ENABLED(CONFIG_ZONE_DMA)) { - max_dma = PFN_DOWN(max_zone_dma_phys()); - zone_size[ZONE_DMA] = max_dma - min; - } +#ifdef CONFIG_ZONE_DMA + max_dma = PFN_DOWN(max_zone_dma_phys()); + zone_size[ZONE_DMA] = max_dma - min; +#endif zone_size[ZONE_NORMAL] = max - max_dma;