linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zhen Lei <thunder.leizhen@huawei.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
	Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>,
	Robert Richter <rrichter@cavium.com>,
	"David Daney" <david.daney@cavium.com>,
	Rob Herring <robh+dt@kernel.org>,
	"Frank Rowand" <frowand.list@gmail.com>,
	Grant Likely <grant.likely@linaro.org>,
	devicetree <devicetree@vger.kernel.org>,
	linux-kernel <linux-kernel@vger.kernel.org>
Cc: Zefan Li <lizefan@huawei.com>, Xinwei Hu <huxinwei@huawei.com>,
	"Tianhong Ding" <dingtianhong@huawei.com>,
	Hanjun Guo <guohanjun@huawei.com>,
	Zhen Lei <thunder.leizhen@huawei.com>
Subject: [PATCH v4 05/14] arm64/numa: avoid inconsistent information to be printed
Date: Tue, 7 Jun 2016 16:08:09 +0800	[thread overview]
Message-ID: <1465286898-13828-6-git-send-email-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <1465286898-13828-1-git-send-email-thunder.leizhen@huawei.com>

numa_init(of_numa_init) may returned error because of numa configuration
error. So "No NUMA configuration found" is inaccurate. In fact, specific
configuration error information should be immediately printed by the
testing branch.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
 arch/arm64/mm/numa.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
index 2601660..1b9622c 100644
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -338,8 +338,10 @@ static int __init numa_init(int (*init_func)(void))
 	if (ret < 0)
 		return ret;

-	if (nodes_empty(numa_nodes_parsed))
+	if (nodes_empty(numa_nodes_parsed)) {
+		pr_info("No NUMA configuration found\n");
 		return -EINVAL;
+	}

 	ret = numa_register_nodes();
 	if (ret < 0)
@@ -370,8 +372,6 @@ static int __init dummy_numa_init(void)

 	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);

--
2.5.0

  parent reply	other threads:[~2016-06-07  8:13 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-07  8:08 [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa Zhen Lei
2016-06-07  8:08 ` [PATCH v4 01/14] of/numa: remove a duplicated pr_debug information Zhen Lei
2016-06-07  8:08 ` [PATCH v4 02/14] of/numa: fix a memory@ node can only contains one memory block Zhen Lei
2016-06-07  8:08 ` [PATCH v4 03/14] arm64/numa: add nid check for " Zhen Lei
2016-06-07  8:08 ` [PATCH v4 04/14] of/numa: remove a duplicated warning Zhen Lei
2016-06-07  8:08 ` Zhen Lei [this message]
2016-06-07  8:08 ` [PATCH v4 06/14] of_numa: Use of_get_next_parent to simplify code Zhen Lei
2016-06-07  8:08 ` [PATCH v4 07/14] of_numa: Use pr_fmt() Zhen Lei
2016-06-07  8:08 ` [PATCH v4 08/14] arm64: numa: " Zhen Lei
2016-06-07  8:08 ` [PATCH v4 09/14] arm64/numa: support HAVE_SETUP_PER_CPU_AREA Zhen Lei
2016-06-07  8:08 ` [PATCH v4 10/14] arm64/numa: define numa_distance as array to simplify code Zhen Lei
2016-06-07  8:08 ` [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES Zhen Lei
2016-06-07  8:31   ` Ganapatrao Kulkarni
2016-06-07 12:57     ` Leizhen (ThunderTown)
2016-06-07 14:01       ` Ganapatrao Kulkarni
2016-06-08  2:16         ` Leizhen (ThunderTown)
2016-06-08  4:45           ` Ganapatrao Kulkarni
2016-06-08  7:49             ` Leizhen (ThunderTown)
2016-06-07  8:08 ` [PATCH v4 12/14] arm64/numa: remove some useless code Zhen Lei
2016-06-07  8:28   ` Ganapatrao Kulkarni
2016-06-07 12:42     ` Leizhen (ThunderTown)
2016-06-07  8:08 ` [PATCH v4 13/14] of/numa: remove the constraint on the distances of node pairs Zhen Lei
2016-06-07  8:08 ` [PATCH v4 14/14] Documentation: " Zhen Lei
2016-06-10 13:08   ` Rob Herring
2016-06-07 13:58 ` [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa Will Deacon
2016-06-08  8:59   ` Leizhen (ThunderTown)
2016-06-14 14:22     ` Catalin Marinas
2016-06-20  6:39       ` Leizhen (ThunderTown)
2016-06-22  1:55         ` Leizhen (ThunderTown)
2016-06-12  7:09   ` Hanjun Guo
2016-06-13 10:12     ` Will Deacon
2016-06-14 10:10       ` Hanjun Guo
2016-06-07 20:38 ` Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1465286898-13828-6-git-send-email-thunder.leizhen@huawei.com \
    --to=thunder.leizhen@huawei.com \
    --cc=catalin.marinas@arm.com \
    --cc=david.daney@cavium.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dingtianhong@huawei.com \
    --cc=frowand.list@gmail.com \
    --cc=gkulkarni@caviumnetworks.com \
    --cc=grant.likely@linaro.org \
    --cc=guohanjun@huawei.com \
    --cc=huxinwei@huawei.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=robh+dt@kernel.org \
    --cc=rrichter@cavium.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).