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 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
mips
/
mti-malta
/
malta-smtc.c
diff --git
a/arch/mips/mti-malta/malta-smtc.c
b/arch/mips/mti-malta/malta-smtc.c
index
aabd727
..
5ba3188
100644
(file)
--- a/
arch/mips/mti-malta/malta-smtc.c
+++ b/
arch/mips/mti-malta/malta-smtc.c
@@
-116,7
+116,7
@@
struct plat_smp_ops msmtc_smp_ops = {
void plat_set_irq_affinity(unsigned int irq, const struct cpumask *affinity)
{
void plat_set_irq_affinity(unsigned int irq, const struct cpumask *affinity)
{
- cpumask_t tmask
= *affinity
;
+ cpumask_t tmask;
int cpu = 0;
void smtc_set_irq_affinity(unsigned int irq, cpumask_t aff);
int cpu = 0;
void smtc_set_irq_affinity(unsigned int irq, cpumask_t aff);
@@
-139,11
+139,12
@@
void plat_set_irq_affinity(unsigned int irq, const struct cpumask *affinity)
* be made to forward to an offline "CPU".
*/
* be made to forward to an offline "CPU".
*/
+ cpumask_copy(&tmask, affinity);
for_each_cpu(cpu, affinity) {
if ((cpu_data[cpu].vpe_id != 0) || !cpu_online(cpu))
cpu_clear(cpu, tmask);
}
for_each_cpu(cpu, affinity) {
if ((cpu_data[cpu].vpe_id != 0) || !cpu_online(cpu))
cpu_clear(cpu, tmask);
}
-
irq_desc[irq].affinity = tmask
;
+
cpumask_copy(irq_desc[irq].affinity, &tmask)
;
if (cpus_empty(tmask))
/*
if (cpus_empty(tmask))
/*