diff --git a/[refs] b/[refs] index e66c36680274..b0f6bb7361de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a51413a65f14e8e872d4da21f7a83656c7abb603 +refs/heads/master: 5e451d9c9d2c20c4f037a0854d3ecca0a69aa56a diff --git a/trunk/arch/sh/mm/init.c b/trunk/arch/sh/mm/init.c index 2a53943924b2..4abf00031dae 100644 --- a/trunk/arch/sh/mm/init.c +++ b/trunk/arch/sh/mm/init.c @@ -321,21 +321,4 @@ int memory_add_physaddr_to_nid(u64 addr) } EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); #endif - -#ifdef CONFIG_MEMORY_HOTREMOVE -int remove_memory(u64 start, u64 size) -{ - unsigned long start_pfn = start >> PAGE_SHIFT; - unsigned long end_pfn = start_pfn + (size >> PAGE_SHIFT); - int ret; - - ret = offline_pages(start_pfn, end_pfn, 120 * HZ); - if (unlikely(ret)) - printk("%s: Failed, offline_pages() == %d\n", __func__, ret); - - return ret; -} -EXPORT_SYMBOL_GPL(remove_memory); -#endif - #endif /* CONFIG_MEMORY_HOTPLUG */