diff options
Diffstat (limited to 'arch/sh/mm')
| -rw-r--r-- | arch/sh/mm/init.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index bf726af5f1a5..ce0bbaa7e404 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c @@ -485,20 +485,20 @@ void free_initrd_mem(unsigned long start, unsigned long end)  #endif  #ifdef CONFIG_MEMORY_HOTPLUG -int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) +int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, +		bool want_memblock)  {  	unsigned long start_pfn = PFN_DOWN(start);  	unsigned long nr_pages = size >> PAGE_SHIFT;  	int ret;  	/* We only have ZONE_NORMAL, so this is easy.. */ -	ret = __add_pages(nid, start_pfn, nr_pages, want_memblock); +	ret = __add_pages(nid, start_pfn, nr_pages, altmap, want_memblock);  	if (unlikely(ret))  		printk("%s: Failed, __add_pages() == %d\n", __func__, ret);  	return ret;  } -EXPORT_SYMBOL_GPL(arch_add_memory);  #ifdef CONFIG_NUMA  int memory_add_physaddr_to_nid(u64 addr) @@ -510,7 +510,7 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);  #endif  #ifdef CONFIG_MEMORY_HOTREMOVE -int arch_remove_memory(u64 start, u64 size) +int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)  {  	unsigned long start_pfn = PFN_DOWN(start);  	unsigned long nr_pages = size >> PAGE_SHIFT; @@ -518,7 +518,7 @@ int arch_remove_memory(u64 start, u64 size)  	int ret;  	zone = page_zone(pfn_to_page(start_pfn)); -	ret = __remove_pages(zone, start_pfn, nr_pages); +	ret = __remove_pages(zone, start_pfn, nr_pages, altmap);  	if (unlikely(ret))  		pr_warn("%s: Failed, __remove_pages() == %d\n", __func__,  			ret); |