arm64, NUMA: Cleanup NUMA disabled messages (34c33370) · Commits · 戴 / test

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> Reviewed-by:

Dennis Chen <dennis.chen@arm.com> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

arch/arm64/mm/numa.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message