summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd.bergmann@de.ibm.com>2006-03-24 19:46:29 +0100
committerPaul Mackerras <paulus@samba.org>2006-03-27 14:48:40 +1100
commit2fa68747dad290f4415e2ea8565d57876747b2d3 (patch)
treeed801d9bbef113a9267127594115c8f3fc5ba7b4 /arch/powerpc
parent16cc11daff0230bcd1ae7327c1c256c0aa02cad6 (diff)
downloadlinux-2fa68747dad290f4415e2ea8565d57876747b2d3.tar.gz
linux-2fa68747dad290f4415e2ea8565d57876747b2d3.tar.bz2
linux-2fa68747dad290f4415e2ea8565d57876747b2d3.zip
[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/powerpc')
-rw-r--r--arch/powerpc/platforms/cell/spider-pic.c2
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)
void __iomem *cfg = spider_get_irq_config(irq);
irq = spider_get_nr(irq);
- out_be32(cfg, in_be32(cfg) | 0x3107000eu | nodeid);
+ out_be32(cfg, (in_be32(cfg) & ~0xf0)| 0x3107000eu | nodeid);
out_be32(cfg + 4, in_be32(cfg + 4) | 0x00020000u | irq);
}