---

yaml
---
r: 13687
b: refs/heads/master
c: 82dd26a
h: refs/heads/master
i:
  13685: 45d73e1
  13683: a87d82a
  13679: 846c53a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd7ccbd3eed52a42dc8bba57717dac3ece39b58e
+refs/heads/master: 82dd26a971848efafc6c8f12803ae012d268d2eb

trunk/include/asm-ppc64/mmzone.h

@@ -33,6 +33,9 @@ extern int numa_cpu_lookup_table[];
 extern char *numa_memory_lookup_table;
 extern cpumask_t numa_cpumask_lookup_table[];
 extern int nr_cpus_in_node[];
+#ifdef CONFIG_MEMORY_HOTPLUG
+extern unsigned long max_pfn;
+#endif
 
 /* 16MB regions */
 #define MEMORY_INCREMENT_SHIFT 24
@@ -45,6 +48,11 @@ static inline int pa_to_nid(unsigned long pa)
 {
 	int nid;
 
+#ifdef CONFIG_MEMORY_HOTPLUG
+	/* kludge hot added sections default to node 0 */
+	if (pa >= (max_pfn << PAGE_SHIFT))
+		return 0;
+#endif
 	nid = numa_memory_lookup_table[pa >> MEMORY_INCREMENT_SHIFT];
 
 #ifdef DEBUG_NUMA