aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/init_64.c5
-rw-r--r--arch/powerpc/mm/mem.c12
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 95a45293e5ac..7e2246fb2f31 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -297,5 +297,10 @@ int __meminit vmemmap_populate(struct page *start_page,
297 297
298 return 0; 298 return 0;
299} 299}
300
301void vmemmap_free(struct page *memmap, unsigned long nr_pages)
302{
303}
304
300#endif /* CONFIG_SPARSEMEM_VMEMMAP */ 305#endif /* CONFIG_SPARSEMEM_VMEMMAP */
301 306
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 40df7c8f2096..f1f7409a4183 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -133,6 +133,18 @@ int arch_add_memory(int nid, u64 start, u64 size)
133 133
134 return __add_pages(nid, zone, start_pfn, nr_pages); 134 return __add_pages(nid, zone, start_pfn, nr_pages);
135} 135}
136
137#ifdef CONFIG_MEMORY_HOTREMOVE
138int arch_remove_memory(u64 start, u64 size)
139{
140 unsigned long start_pfn = start >> PAGE_SHIFT;
141 unsigned long nr_pages = size >> PAGE_SHIFT;
142 struct zone *zone;
143
144 zone = page_zone(pfn_to_page(start_pfn));
145 return __remove_pages(zone, start_pfn, nr_pages);
146}
147#endif
136#endif /* CONFIG_MEMORY_HOTPLUG */ 148#endif /* CONFIG_MEMORY_HOTPLUG */
137 149
138/* 150/*