patch-2.4.0-test12 linux/arch/mips64/sgi-ip27/ip27-klnuma.c

Next file: linux/arch/mips64/sgi-ip27/ip27-memory.c
Previous file: linux/arch/mips64/sgi-ip27/ip27-irq.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test11/linux/arch/mips64/sgi-ip27/ip27-klnuma.c linux/arch/mips64/sgi-ip27/ip27-klnuma.c
@@ -136,9 +136,7 @@
 	loadbase = CKSSEG + 16777216;
 #endif
 	offset = PAGE_ALIGN((unsigned long)(&_end)) - loadbase;
-	if (cnode == 0)
-		return (offset >> PAGE_SHIFT);
-	else if (CPUMASK_TSTB(ktext_repmask, cnode))
+	if ((cnode == 0) || (CPUMASK_TSTB(ktext_repmask, cnode)))
 		return (TO_NODE(nasid, offset) >> PAGE_SHIFT);
 	else
 		return (KDM_TO_PHYS(PAGE_ALIGN(SYMMON_STK_ADDR(nasid, 0))) >> 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)