[PATCH] Memory Add Fixes for ppc64
This is a temporary kludge that supports adding all new memory to node 0. I will provide a more complete solution similar to that used for dynamically added CPUs in a few days. Signed-off-by: Mike Kravetz <kravetz@us.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Родитель
dd7ccbd3ee
Коммит
82dd26a971
|
@ -33,6 +33,9 @@ extern int numa_cpu_lookup_table[];
|
||||||
extern char *numa_memory_lookup_table;
|
extern char *numa_memory_lookup_table;
|
||||||
extern cpumask_t numa_cpumask_lookup_table[];
|
extern cpumask_t numa_cpumask_lookup_table[];
|
||||||
extern int nr_cpus_in_node[];
|
extern int nr_cpus_in_node[];
|
||||||
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
||||||
|
extern unsigned long max_pfn;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* 16MB regions */
|
/* 16MB regions */
|
||||||
#define MEMORY_INCREMENT_SHIFT 24
|
#define MEMORY_INCREMENT_SHIFT 24
|
||||||
|
@ -45,6 +48,11 @@ static inline int pa_to_nid(unsigned long pa)
|
||||||
{
|
{
|
||||||
int nid;
|
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];
|
nid = numa_memory_lookup_table[pa >> MEMORY_INCREMENT_SHIFT];
|
||||||
|
|
||||||
#ifdef DEBUG_NUMA
|
#ifdef DEBUG_NUMA
|
||||||
|
|
Загрузка…
Ссылка в новой задаче