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 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
irq-gic.c
diff --git
a/arch/mips/kernel/irq-gic.c
b/arch/mips/kernel/irq-gic.c
index
87deb8f
..
3f43c2e
100644
(file)
--- a/
arch/mips/kernel/irq-gic.c
+++ b/
arch/mips/kernel/irq-gic.c
@@
-155,7
+155,7
@@
static void gic_unmask_irq(unsigned int irq)
static DEFINE_SPINLOCK(gic_lock);
static DEFINE_SPINLOCK(gic_lock);
-static
void
gic_set_affinity(unsigned int irq, const struct cpumask *cpumask)
+static
int
gic_set_affinity(unsigned int irq, const struct cpumask *cpumask)
{
cpumask_t tmp = CPU_MASK_NONE;
unsigned long flags;
{
cpumask_t tmp = CPU_MASK_NONE;
unsigned long flags;
@@
-166,7
+166,7
@@
static void gic_set_affinity(unsigned int irq, const struct cpumask *cpumask)
cpumask_and(&tmp, cpumask, cpu_online_mask);
if (cpus_empty(tmp))
cpumask_and(&tmp, cpumask, cpu_online_mask);
if (cpus_empty(tmp))
- return;
+ return
-1
;
/* Assumption : cpumask refers to a single CPU */
spin_lock_irqsave(&gic_lock, flags);
/* Assumption : cpumask refers to a single CPU */
spin_lock_irqsave(&gic_lock, flags);
@@
-190,6
+190,7
@@
static void gic_set_affinity(unsigned int irq, const struct cpumask *cpumask)
cpumask_copy(irq_desc[irq].affinity, cpumask);
spin_unlock_irqrestore(&gic_lock, flags);
cpumask_copy(irq_desc[irq].affinity, cpumask);
spin_unlock_irqrestore(&gic_lock, flags);
+ return 0;
}
#endif
}
#endif