Skip to content

Commit

Permalink
sh: Kill off duplicate remove_memory() definition.
Browse files Browse the repository at this point in the history
Use the generic remove_memory() provided by mm/memory_hotplug.c instead.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Andrew Morton authored and Paul Mundt committed Oct 21, 2008
1 parent a51413a commit 5e451d9
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions arch/sh/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

0 comments on commit 5e451d9

Please sign in to comment.