diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2008-10-20 23:37:36 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 23:51:51 -0400 |
commit | 5e451d9c9d2c20c4f037a0854d3ecca0a69aa56a (patch) | |
tree | b8369ec875473a37a1f2e70ae655801b40381eed /arch/sh/mm/init.c | |
parent | a51413a65f14e8e872d4da21f7a83656c7abb603 (diff) |
sh: Kill off duplicate remove_memory() definition.
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>
Diffstat (limited to 'arch/sh/mm/init.c')
-rw-r--r-- | arch/sh/mm/init.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 2a53943924b2..4abf00031dae 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
@@ -321,21 +321,4 @@ int memory_add_physaddr_to_nid(u64 addr) | |||
321 | } | 321 | } |
322 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | 322 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
323 | #endif | 323 | #endif |
324 | |||
325 | #ifdef CONFIG_MEMORY_HOTREMOVE | ||
326 | int remove_memory(u64 start, u64 size) | ||
327 | { | ||
328 | unsigned long start_pfn = start >> PAGE_SHIFT; | ||
329 | unsigned long end_pfn = start_pfn + (size >> PAGE_SHIFT); | ||
330 | int ret; | ||
331 | |||
332 | ret = offline_pages(start_pfn, end_pfn, 120 * HZ); | ||
333 | if (unlikely(ret)) | ||
334 | printk("%s: Failed, offline_pages() == %d\n", __func__, ret); | ||
335 | |||
336 | return ret; | ||
337 | } | ||
338 | EXPORT_SYMBOL_GPL(remove_memory); | ||
339 | #endif | ||
340 | |||
341 | #endif /* CONFIG_MEMORY_HOTPLUG */ | 324 | #endif /* CONFIG_MEMORY_HOTPLUG */ |