From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753920AbcEaM2j (ORCPT <rfc822;w@1wt.eu>);
	Tue, 31 May 2016 08:28:39 -0400
Received: from mail-pa0-f54.google.com ([209.85.220.54]:36588 "EHLO
	mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753333AbcEaM2g (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 31 May 2016 08:28:36 -0400
Subject: Re: [PATCH v7 07/15] arm64, numa: Cleanup NUMA disabled messages.
To: David Daney <ddaney.cavm@gmail.com>, Will Deacon <will.deacon@arm.com>,
        linux-arm-kernel@lists.infradead.org,
        Mark Rutland <mark.rutland@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Tony Luck <tony.luck@intel.com>, Fenghua Yu <fenghua.yu@intel.com>,
        Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org>,
        Rob Herring <robh+dt@kernel.org>,
        Frank Rowand <frowand.list@gmail.com>,
        Grant Likely <grant.likely@linaro.org>,
        Robert Moore <robert.moore@intel.com>, Lv Zheng <lv.zheng@intel.com>,
        Marc Zyngier <Marc.Zyngier@arm.com>, linux-ia64@vger.kernel.org,
        linux-acpi@vger.kernel.org, devel@acpica.org
References: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com>
 <1464129345-18985-8-git-send-email-ddaney.cavm@gmail.com>
Cc: linux-kernel@vger.kernel.org, Robert Richter <rrichter@cavium.com>,
        David Daney <david.daney@cavium.com>
From: Hanjun Guo <hanjun.guo@linaro.org>
Message-ID: <574D836A.2090905@linaro.org>
Date: Tue, 31 May 2016 20:28:26 +0800
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101
 Thunderbird/38.7.2
MIME-Version: 1.0
In-Reply-To: <1464129345-18985-8-git-send-email-ddaney.cavm@gmail.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2016/5/25 6:35, David Daney wrote:
> From: David Daney <david.daney@cavium.com>
>
> As noted by Dennis Chen, we don't want to print "No NUMA configuration
> found" if NUMA was forced off from the command line.
>
> Change the type of numa_off to bool, and clean up printing code.
> Print "NUMA disabled" if forced off on command line and "No NUMA
> configuration found" if there was no firmware NUMA information.
>
> Signed-off-by: David Daney <david.daney@cavium.com>
> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
> ---
>   arch/arm64/mm/numa.c | 11 +++++++----
>   1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
> index 6cb03f9..1def1de 100644
> --- a/arch/arm64/mm/numa.c
> +++ b/arch/arm64/mm/numa.c
> @@ -29,7 +29,7 @@ static int cpu_to_node_map[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE };
>
>   static int numa_distance_cnt;
>   static u8 *numa_distance;
> -static int numa_off;
> +static bool numa_off;
>
>   static __init int numa_parse_early_param(char *opt)
>   {
> @@ -37,7 +37,7 @@ static __init int numa_parse_early_param(char *opt)
>   		return -EINVAL;
>   	if (!strncmp(opt, "off", 3)) {
>   		pr_info("%s\n", "NUMA turned off");
> -		numa_off = 1;
> +		numa_off = true;
>   	}
>   	return 0;
>   }
> @@ -362,7 +362,10 @@ static int __init dummy_numa_init(void)
>   	int ret;
>   	struct memblock_region *mblk;
>
> -	pr_info("%s\n", "No NUMA configuration found");
> +	if (numa_off)
> +		pr_info("NUMA disabled\n"); /* Forced off on command line. */
> +	else
> +		pr_info("No NUMA configuration found\n");
>   	pr_info("NUMA: Faking a node at [mem %#018Lx-%#018Lx]\n",
>   	       0LLU, PFN_PHYS(max_pfn) - 1);
>
> @@ -375,7 +378,7 @@ static int __init dummy_numa_init(void)
>   		return ret;
>   	}
>
> -	numa_off = 1;
> +	numa_off = true;
>   	return 0;
>   }

Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>

>
>