|
@@ -673,16 +673,10 @@ void __init mem_init(void)
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * this is for the non-NUMA, single node SMP system case.
|
|
|
- * Specifically, in the case of x86, we will always add
|
|
|
- * memory to the highmem for now.
|
|
|
- */
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
|
-#ifndef CONFIG_NEED_MULTIPLE_NODES
|
|
|
int arch_add_memory(int nid, u64 start, u64 size)
|
|
|
{
|
|
|
- struct pglist_data *pgdata = &contig_page_data;
|
|
|
+ struct pglist_data *pgdata = NODE_DATA(nid);
|
|
|
struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM;
|
|
|
unsigned long start_pfn = start >> PAGE_SHIFT;
|
|
|
unsigned long nr_pages = size >> PAGE_SHIFT;
|
|
@@ -694,7 +688,7 @@ int remove_memory(u64 start, u64 size)
|
|
|
{
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
-#endif
|
|
|
+EXPORT_SYMBOL_GPL(remove_memory);
|
|
|
#endif
|
|
|
|
|
|
struct kmem_cache *pgd_cache;
|