Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1415843

[PATCH v4 05/14] arm64/numa: avoid inconsistent information to be printed

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 00/14] fix some type infos and bugs for arm64/of numa Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
  [PATCH v4 06/14] of_numa: Use of_get_next_parent to simplify code Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
  [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
    Re: [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES Ganapatrao Kulkarni <gpkulkarni@gmail.com> - 2016-06-07 10:40 +0200
      Re: [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> - 2016-06-07 15:00 +0200
        Re: [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES Ganapatrao Kulkarni <gpkulkarni@gmail.com> - 2016-06-07 16:10 +0200
          Re: [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> - 2016-06-08 04:30 +0200
            Re: [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES Ganapatrao Kulkarni <gpkulkarni@gmail.com> - 2016-06-08 06:50 +0200
              Re: [PATCH v4 11/14] arm64/numa: support HAVE_MEMORYLESS_NODES "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> - 2016-06-08 10:00 +0200
  [PATCH v4 08/14] arm64: numa: Use pr_fmt() Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
  [PATCH v4 02/14] of/numa: fix a memory@ node can only contains one memory block Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
  [PATCH v4 01/14] of/numa: remove a duplicated pr_debug information Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
  [PATCH v4 05/14] arm64/numa: avoid inconsistent information to be printed Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
  [PATCH v4 09/14] arm64/numa: support HAVE_SETUP_PER_CPU_AREA Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
  [PATCH v4 12/14] arm64/numa: remove some useless code Zhen Lei <thunder.leizhen@huawei.com> - 2016-06-07 10:20 +0200
    Re: [PATCH v4 12/14] arm64/numa: remove some useless code Ganapatrao Kulkarni <gpkulkarni@gmail.com> - 2016-06-07 10:30 +0200
      Re: [PATCH v4 12/14] arm64/numa: remove some useless code "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> - 2016-06-07 14:50 +0200
  Re: [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa Will Deacon <will.deacon@arm.com> - 2016-06-07 16:00 +0200
    Re: [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> - 2016-06-08 11:10 +0200
  Re: [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa Rob Herring <robh+dt@kernel.org> - 2016-06-07 22:40 +0200

csiph-web