[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: Nathan Lynch <nathanl@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index a5286a68760a4aa863903adf8aaac4e8880c4f5a..dd611ef8df7a229dc2dddc95eb350dbc8cf7bc30 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -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,14 +302,9 @@ 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);
+               printk(KERN_ERR "WARNING: cpu %ld "
+                      "maps to invalid NUMA node %d\n",
+                      lcpu, nid);
                nid = 0;
        }
 out:
@@ -442,10 +442,9 @@ new_range:
                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);
+                       printk(KERN_ERR "WARNING: memory at %lx maps "
+                              "to invalid NUMA node %d\n", start,
+                              nid);
                        nid = 0;
                }