Revert "lib: Restrict cpumask_local_spread to houskeeping CPUs"

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

diff --git a/lib/cpumask.c b/lib/cpumask.c
index 35924025097b963b513da7cd75f06073a8d71c31..c3c76b833384686e43f0b9389874625ebf30709b 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -6,7 +6,6 @@
 #include <linux/export.h>
 #include <linux/memblock.h>
 #include <linux/numa.h>
-#include <linux/sched/isolation.h>
 
 /**
  * cpumask_next - get the next cpu in a cpumask
@@ -206,27 +205,22 @@ void __init free_bootmem_cpumask_var(cpumask_var_t mask)
  */
 unsigned int cpumask_local_spread(unsigned int i, int node)
 {
-       int cpu, hk_flags;
-       const struct cpumask *mask;
+       int cpu;
 
-       hk_flags = HK_FLAG_DOMAIN | HK_FLAG_MANAGED_IRQ;
-       mask = housekeeping_cpumask(hk_flags);
        /* Wrap: we always want a cpu. */
-       i %= cpumask_weight(mask);
+       i %= num_online_cpus();
 
        if (node == NUMA_NO_NODE) {
-               for_each_cpu(cpu, mask) {
+               for_each_cpu(cpu, cpu_online_mask)
                        if (i-- == 0)
                                return cpu;
-               }
        } else {
                /* NUMA first. */
-               for_each_cpu_and(cpu, cpumask_of_node(node), mask) {
+               for_each_cpu_and(cpu, cpumask_of_node(node), cpu_online_mask)
                        if (i-- == 0)
                                return cpu;
-               }
 
-               for_each_cpu(cpu, mask) {
+               for_each_cpu(cpu, cpu_online_mask) {
                        /* Skip NUMA nodes, done above. */
                        if (cpumask_test_cpu(cpu, cpumask_of_node(node)))
                                continue;