Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc16a759 authored by Nathan Lynch's avatar Nathan Lynch Committed by Paul Mackerras
Browse files

[PATCH] powerpc numa: Consolidate handling of Power4 special case 



Code to handle Power4's invalid node id (0xffff) is duplicated for cpu
and memory.  Better to handle this case in one place --
of_node_to_nid.  Overall behavior should be unchanged.

Signed-off-by: default avatarNathan Lynch <nathanl@austin.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent cf950b7a

arch/powerpc/mm/numa.c

+11 −12
Original line number Diff line number Diff line
@@ -207,6 +207,11 @@ static int of_node_to_nid(struct device_node *device) 
		    device->full_name);

		nid = 0;

	}



	/* POWER4 LPAR uses 0xffff as invalid node */

	if (nid == 0xffff)

		nid = 0;



	return nid;

}
@@ -297,11 +302,6 @@ static int __cpuinit numa_setup_cpu(unsigned long lcpu) 
	nid = of_node_to_nid(cpu);



	if (nid >= num_online_nodes()) {

		/*

		 * POWER4 LPAR uses 0xffff as invalid node,

		 * dont warn in this case.

		 */

		if (nid != 0xffff)

		printk(KERN_ERR "WARNING: cpu %ld "

		       "maps to invalid NUMA node %d\n",

		       lcpu, nid);
@@ -442,7 +442,6 @@ static int __init parse_numa_properties(void) 
		nid = of_node_to_nid(memory);



		if (nid >= MAX_NUMNODES) {

			if (nid != 0xffff)

			printk(KERN_ERR "WARNING: memory at %lx maps "

			       "to invalid NUMA node %d\n", start,

			       nid);