Merge branch 'bugzilla-11715' into test

[sfrench/cifs-2.6.git] / arch / s390 / mm / init.c

diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 1169130a97efdc2661a8e51fcfa9abbb33f4f5cc..158b0d6d70462942975048759222c6fa69874433 100644 (file)
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -189,14 +189,3 @@ int arch_add_memory(int nid, u64 start, u64 size)
        return rc;
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
-
-#ifdef CONFIG_MEMORY_HOTREMOVE
-int remove_memory(u64 start, u64 size)
-{
-       unsigned long start_pfn, end_pfn;
-
-       start_pfn = PFN_DOWN(start);
-       end_pfn = start_pfn + PFN_DOWN(size);
-       return offline_pages(start_pfn, end_pfn, 120 * HZ);
-}
-#endif /* CONFIG_MEMORY_HOTREMOVE */