UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] x86_64 irq: Simplfy __assign_irq_vector 

By precomputing old_mask I remove an extra if statement, remove an
indentation level and make the code slightly easier to read.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Eric W. Biederman 2007-02-23 04:11:56 -07:00 committed by Linus Torvalds
parent ea3d5226f5
commit fc5d56f987
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86_64/kernel/io_apic.c
View File

@ -685,6 +685,7 @@ static int __assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result)
* 0x80, because int 0x80 is hm, kind of importantish. ;) * 0x80, because int 0x80 is hm, kind of importantish. ;)
*/ */
static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0; static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0;
cpumask_t old_mask = CPU_MASK_NONE;
int old_vector = -1; int old_vector = -1;
int cpu; int cpu;
@ -699,11 +700,12 @@ static int __assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result)
cpus_and(*result, irq_domain[irq], mask); cpus_and(*result, irq_domain[irq], mask);
if (!cpus_empty(*result)) if (!cpus_empty(*result))
return old_vector; return old_vector;
cpus_and(old_mask, irq_domain[irq], cpu_online_map);
} }
for_each_cpu_mask(cpu, mask) { for_each_cpu_mask(cpu, mask) {
cpumask_t domain, new_mask; cpumask_t domain, new_mask;
int new_cpu; int new_cpu, old_cpu;
int vector, offset; int vector, offset;
domain = vector_allocation_domain(cpu); domain = vector_allocation_domain(cpu);
@ -728,13 +730,8 @@ next:
/* Found one! */ /* Found one! */
current_vector = vector; current_vector = vector;
current_offset = offset; current_offset = offset;
if (old_vector >= 0) {
cpumask_t old_mask;
int old_cpu;
cpus_and(old_mask, irq_domain[irq], cpu_online_map);
for_each_cpu_mask(old_cpu, old_mask) for_each_cpu_mask(old_cpu, old_mask)
per_cpu(vector_irq, old_cpu)[old_vector] = -1; per_cpu(vector_irq, old_cpu)[old_vector] = -1;
}
for_each_cpu_mask(new_cpu, new_mask) for_each_cpu_mask(new_cpu, new_mask)
per_cpu(vector_irq, new_cpu)[vector] = irq; per_cpu(vector_irq, new_cpu)[vector] = irq;
irq_vector[irq] = vector; irq_vector[irq] = vector;