aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/init.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
commit4944dd62de21230af039eda7cd218e9a09021d11 (patch)
treebac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/sh/mm/init.c
parentf17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff)
parent0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff)
downloadkernel_replicant_linux-4944dd62de21230af039eda7cd218e9a09021d11.tar.gz
kernel_replicant_linux-4944dd62de21230af039eda7cd218e9a09021d11.tar.bz2
kernel_replicant_linux-4944dd62de21230af039eda7cd218e9a09021d11.zip
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/sh/mm/init.c')
-rw-r--r--arch/sh/mm/init.c17
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)
}
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 */