diff --git a/[refs] b/[refs]
index e401a1188bc0..28869ae442a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf950b7af0e51935e559c54262214423e2b6c88a
+refs/heads/master: bc16a75926941094db6b42d76014abb5e8d3a910
diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c
index a5286a68760a..dd611ef8df7a 100644
--- a/trunk/arch/powerpc/mm/numa.c
+++ b/trunk/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 @@ 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);
+			printk(KERN_ERR "WARNING: memory at %lx maps "
+			       "to invalid NUMA node %d\n", start,
+			       nid);
 			nid = 0;
 		}