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 'linus' into core/percpu
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
xics.c
diff --git
a/arch/powerpc/platforms/pseries/xics.c
b/arch/powerpc/platforms/pseries/xics.c
index
84e058f
..
80b5134
100644
(file)
--- a/
arch/powerpc/platforms/pseries/xics.c
+++ b/
arch/powerpc/platforms/pseries/xics.c
@@
-153,9
+153,10
@@
static int get_irq_server(unsigned int virq, unsigned int strict_check)
{
int server;
/* For the moment only implement delivery to all cpus or one cpu */
{
int server;
/* For the moment only implement delivery to all cpus or one cpu */
- cpumask_t cpumask
= irq_desc[virq].affinity
;
+ cpumask_t cpumask;
cpumask_t tmp = CPU_MASK_NONE;
cpumask_t tmp = CPU_MASK_NONE;
+ cpumask_copy(&cpumask, irq_desc[virq].affinity);
if (!distribute_irqs)
return default_server;
if (!distribute_irqs)
return default_server;
@@
-869,7
+870,7
@@
void xics_migrate_irqs_away(void)
virq, cpu);
/* Reset affinity to all cpus */
virq, cpu);
/* Reset affinity to all cpus */
-
irq_desc[virq].affinity = CPU_MASK_ALL
;
+
cpumask_setall(irq_desc[virq].affinity)
;
desc->chip->set_affinity(virq, cpu_all_mask);
unlock:
spin_unlock_irqrestore(&desc->lock, flags);
desc->chip->set_affinity(virq, cpu_all_mask);
unlock:
spin_unlock_irqrestore(&desc->lock, flags);