summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-23 04:20:59 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 10:34:08 -0800
commit5ff5115efafb08b49cbc8abdea9726884fba0b5a (patch)
tree178a64ae41473e353f9c028067da827731f8cb52 /arch/x86_64
parenta8c8a36736c00b261fd5dd01400c41726f2f19eb (diff)
downloadblackbird-op-linux-5ff5115efafb08b49cbc8abdea9726884fba0b5a.tar.gz
blackbird-op-linux-5ff5115efafb08b49cbc8abdea9726884fba0b5a.zip
[PATCH] x86_64 irq: Simplfiy the set_affinity logic.
For some reason the code has been picking TARGET_CPUS when asked to set the affinity to an empty set of cpus. That is just silly it's extra work. Instead if there are no cpus to set the affinity to we should just give up immediately. That is simpler and a little more intuitive. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/io_apic.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index e0648380fdde..74671defbbe3 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -244,9 +244,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
cpus_and(tmp, mask, cpu_online_map);
if (cpus_empty(tmp))
- tmp = TARGET_CPUS;
-
- cpus_and(mask, tmp, CPU_MASK_ALL);
+ return;
vector = assign_irq_vector(irq, mask, &tmp);
if (vector < 0)
@@ -1890,9 +1888,7 @@ static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask)
cpus_and(tmp, mask, cpu_online_map);
if (cpus_empty(tmp))
- tmp = TARGET_CPUS;
-
- cpus_and(mask, tmp, CPU_MASK_ALL);
+ return;
vector = assign_irq_vector(irq, mask, &tmp);
if (vector < 0)
@@ -1985,9 +1981,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask)
cpus_and(tmp, mask, cpu_online_map);
if (cpus_empty(tmp))
- tmp = TARGET_CPUS;
-
- cpus_and(mask, tmp, CPU_MASK_ALL);
+ return;
vector = assign_irq_vector(irq, mask, &tmp);
if (vector < 0)
OpenPOWER on IntegriCloud