Commit 34c33370 authored by David Daney's avatar David Daney Committed by Rafael J. Wysocki

arm64, NUMA: Cleanup NUMA disabled messages

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: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarDennis Chen <dennis.chen@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8ccbbdaa
...@@ -29,7 +29,7 @@ static int cpu_to_node_map[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; ...@@ -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 int numa_distance_cnt;
static u8 *numa_distance; static u8 *numa_distance;
static int numa_off; static bool numa_off;
static __init int numa_parse_early_param(char *opt) static __init int numa_parse_early_param(char *opt)
{ {
...@@ -37,7 +37,7 @@ static __init int numa_parse_early_param(char *opt) ...@@ -37,7 +37,7 @@ static __init int numa_parse_early_param(char *opt)
return -EINVAL; return -EINVAL;
if (!strncmp(opt, "off", 3)) { if (!strncmp(opt, "off", 3)) {
pr_info("%s\n", "NUMA turned off"); pr_info("%s\n", "NUMA turned off");
numa_off = 1; numa_off = true;
} }
return 0; return 0;
} }
...@@ -362,7 +362,10 @@ static int __init dummy_numa_init(void) ...@@ -362,7 +362,10 @@ static int __init dummy_numa_init(void)
int ret; int ret;
struct memblock_region *mblk; 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", pr_info("NUMA: Faking a node at [mem %#018Lx-%#018Lx]\n",
0LLU, PFN_PHYS(max_pfn) - 1); 0LLU, PFN_PHYS(max_pfn) - 1);
...@@ -375,7 +378,7 @@ static int __init dummy_numa_init(void) ...@@ -375,7 +378,7 @@ static int __init dummy_numa_init(void)
return ret; return ret;
} }
numa_off = 1; numa_off = true;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment