sched/topology: Handle NUMA_NO_NODE in sched_numa_find_nth_cpu()

[thirdparty/kernel/stable.git] / lib / cpumask.c

diff --git a/lib/cpumask.c b/lib/cpumask.c
index a7fd02b5ae264ce1d8e58b949face2bbefc5fcb0..34335c1e72653dc97e55bab4c0fb9c9b260c315c 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -146,9 +146,7 @@ unsigned int cpumask_local_spread(unsigned int i, int node)
        /* Wrap: we always want a cpu. */
        i %= num_online_cpus();
 
-       cpu = (node == NUMA_NO_NODE) ?
-               cpumask_nth(i, cpu_online_mask) :
-               sched_numa_find_nth_cpu(cpu_online_mask, i, node);
+       cpu = sched_numa_find_nth_cpu(cpu_online_mask, i, node);
 
        WARN_ON(cpu >= nr_cpu_ids);
        return cpu;