Merge tag 'x86-urgent-2022-08-06' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / mm / numa.c

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index e8b061557887dd262bf4d49a5edd7d51bdfe27ac..2aadb2019b4f235b58dbbc3a2aaa54f3c2da4921 100644 (file)
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -867,7 +867,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable)
                return;
        }
        mask = node_to_cpumask_map[node];
-       if (!mask) {
+       if (!cpumask_available(mask)) {
                pr_err("node_to_cpumask_map[%i] NULL\n", node);
                dump_stack();
                return;
@@ -913,7 +913,7 @@ const struct cpumask *cpumask_of_node(int node)
                dump_stack();
                return cpu_none_mask;
        }
-       if (node_to_cpumask_map[node] == NULL) {
+       if (!cpumask_available(node_to_cpumask_map[node])) {
                printk(KERN_WARNING
                        "cpumask_of_node(%d): no node_to_cpumask_map!\n",
                        node);