git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
irq_64.c
diff --git
a/arch/sparc/kernel/irq_64.c
b/arch/sparc/kernel/irq_64.c
index
b1d275c
..
4e78862
100644
(file)
--- a/
arch/sparc/kernel/irq_64.c
+++ b/
arch/sparc/kernel/irq_64.c
@@
-224,13
+224,13
@@
static int irq_choose_cpu(unsigned int irq, const struct cpumask *affinity)
int cpuid;
cpumask_copy(&mask, affinity);
int cpuid;
cpumask_copy(&mask, affinity);
- if (cpu
s_equal(mask, cpu_online_map
)) {
+ if (cpu
mask_equal(&mask, cpu_online_mask
)) {
cpuid = map_to_cpu(irq);
} else {
cpumask_t tmp;
cpuid = map_to_cpu(irq);
} else {
cpumask_t tmp;
- cpu
s_and(tmp, cpu_online_map,
mask);
- cpuid = cpu
s_empty(tmp) ? map_to_cpu(irq) : first_cpu(
tmp);
+ cpu
mask_and(&tmp, cpu_online_mask, &
mask);
+ cpuid = cpu
mask_empty(&tmp) ? map_to_cpu(irq) : cpumask_first(&
tmp);
}
return cpuid;
}
return cpuid;