From: Arnd Bergmann Date: Fri, 24 Mar 2006 18:46:29 +0000 (+0100) Subject: [PATCH] powerpc: fix spider-pic affinity setting X-Git-Tag: v2.6.17-rc1~165^2~47 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fa68747dad290f4415e2ea8565d57876747b2d3;p=linux-2.6 [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 Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c index 0e9bb0b72c..9647a8dad4 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); }