]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Revert "x86/apic: Make arch_setup_hwirq NUMA node aware"
authorBrian Maly <brian.maly@oracle.com>
Thu, 28 Mar 2019 03:49:25 +0000 (23:49 -0400)
committerBrian Maly <brian.maly@oracle.com>
Thu, 28 Mar 2019 03:49:25 +0000 (23:49 -0400)
Orabug: 29542185

This reverts commit ff3efcf39b34994ab1ba9390bd3a79c1a985c895.

arch/x86/kernel/apic/vector.c

index 4345000c66325c04d3e842e9e02fc6e271a25dc2..4902161b69e33287d9a7f0acf84a40414c685f32 100644 (file)
@@ -509,17 +509,7 @@ int arch_setup_hwirq(unsigned int irq, int node)
                return -ENOMEM;
 
        raw_spin_lock_irqsave(&vector_lock, flags);
-       if (node != NUMA_NO_NODE) {
-               const struct cpumask *node_mask = cpumask_of_node(node);
-               struct cpumask apic_mask;
-
-               cpumask_copy(&apic_mask, apic->target_cpus());
-               if (cpumask_intersects(&apic_mask, node_mask))
-                       cpumask_and(&apic_mask, &apic_mask, node_mask);
-               ret = __assign_irq_vector(irq, cfg, &apic_mask);
-       } else {
-               ret = __assign_irq_vector(irq, cfg, apic->target_cpus());
-       }
+       ret = __assign_irq_vector(irq, cfg, apic->target_cpus());
        raw_spin_unlock_irqrestore(&vector_lock, flags);
 
        if (!ret)