aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memory_hotplug.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 821dee596377..380aef45c2cf 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -447,7 +447,8 @@ int online_pages(unsigned long pfn, unsigned long nr_pages)
447} 447}
448#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ 448#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */
449 449
450static pg_data_t *hotadd_new_pgdat(int nid, u64 start) 450/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */
451static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start)
451{ 452{
452 struct pglist_data *pgdat; 453 struct pglist_data *pgdat;
453 unsigned long zones_size[MAX_NR_ZONES] = {0}; 454 unsigned long zones_size[MAX_NR_ZONES] = {0};