diff options
author | Arnd Bergmann <arnd.bergmann@de.ibm.com> | 2006-03-24 13:46:29 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-26 22:48:40 -0500 |
commit | 2fa68747dad290f4415e2ea8565d57876747b2d3 (patch) | |
tree | ed801d9bbef113a9267127594115c8f3fc5ba7b4 /arch | |
parent | 16cc11daff0230bcd1ae7327c1c256c0aa02cad6 (diff) |
[PATCH] powerpc: fix spider-pic affinity setting
As noticed by Milton Miller, setting the initial affinity in
spider-pic can go wrong if the target node field was not orinally
empty.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/cell/spider-pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index 0e9bb0b72c50..9647a8dad4fe 100644 --- a/arch/powerpc/platforms/cell/spider-pic.c +++ b/arch/powerpc/platforms/cell/spider-pic.c | |||
@@ -88,7 +88,7 @@ static void spider_enable_irq(unsigned int irq) | |||
88 | void __iomem *cfg = spider_get_irq_config(irq); | 88 | void __iomem *cfg = spider_get_irq_config(irq); |
89 | irq = spider_get_nr(irq); | 89 | irq = spider_get_nr(irq); |
90 | 90 | ||
91 | out_be32(cfg, in_be32(cfg) | 0x3107000eu | nodeid); | 91 | out_be32(cfg, (in_be32(cfg) & ~0xf0)| 0x3107000eu | nodeid); |
92 | out_be32(cfg + 4, in_be32(cfg + 4) | 0x00020000u | irq); | 92 | out_be32(cfg + 4, in_be32(cfg + 4) | 0x00020000u | irq); |
93 | } | 93 | } |
94 | 94 | ||