From: Brian Maly <brian.maly@oracle.com>
Date: Thu, 28 Mar 2019 03:49:25 +0000 (-0400)
Subject: Revert "x86/apic: Make arch_setup_hwirq NUMA node aware"
X-Git-Tag: v4.1.12-124.31.3~213
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b713fa6eebeb17a407a356737b56280720cff1c6;p=users%2Fjedix%2Flinux-maple.git

Revert "x86/apic: Make arch_setup_hwirq NUMA node aware"

Orabug: 29542185

This reverts commit ff3efcf39b34994ab1ba9390bd3a79c1a985c895.
---

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 4345000c6632..4902161b69e3 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -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)