]> err.no Git - linux-2.6/commitdiff
[PATCH] powerpc: fix spider-pic affinity setting
authorArnd Bergmann <arnd.bergmann@de.ibm.com>
Fri, 24 Mar 2006 18:46:29 +0000 (19:46 +0100)
committerPaul Mackerras <paulus@samba.org>
Mon, 27 Mar 2006 03:48:40 +0000 (14:48 +1100)
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>
arch/powerpc/platforms/cell/spider-pic.c

index 0e9bb0b72c50723c5065982a01f84ee4ff145c29..9647a8dad4fe4af995f6a83a5a4800ac96b1d8fa 100644 (file)
@@ -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);
 }