From 28a6f55bb18a2309f2d8a63e998b18e3a5132419 Mon Sep 17 00:00:00 2001 From: Mike Kravetz Date: Fri, 4 Nov 2005 15:20:24 -0800 Subject: [PATCH] --- yaml --- r: 13687 b: refs/heads/master c: 82dd26a971848efafc6c8f12803ae012d268d2eb h: refs/heads/master i: 13685: 45d73e1c714663fbfc852ee45f4f04bd170e4cff 13683: a87d82a177819a413dbe45cc682991bfa676bf7b 13679: 846c53a3cc742f18cc778d1a0032348cea69b28d v: v3 --- [refs] | 2 +- trunk/include/asm-ppc64/mmzone.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a29d12ae3a8e..10e66c5dd095 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd7ccbd3eed52a42dc8bba57717dac3ece39b58e +refs/heads/master: 82dd26a971848efafc6c8f12803ae012d268d2eb diff --git a/trunk/include/asm-ppc64/mmzone.h b/trunk/include/asm-ppc64/mmzone.h index 80a708e7093a..15e777ce0f4a 100644 --- a/trunk/include/asm-ppc64/mmzone.h +++ b/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