memory-hotplug: integrated __remove_section() of CONFIG_SPARSEMEM_VMEMMAP.

[platform/adaptation/renesas_rcar/renesas_kernel.git] / mm / memory_hotplug.c

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 220459c..46c58be 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -432,16 +432,6 @@ static int __meminit __add_section(int nid, struct zone *zone,
        return register_new_memory(nid, __pfn_to_section(phys_start_pfn));
 }
 
-#ifdef CONFIG_SPARSEMEM_VMEMMAP
-static int __remove_section(struct zone *zone, struct mem_section *ms)
-{
-       /*
-        * XXX: Freeing memmap with vmemmap is not implement yet.
-        *      This should be removed later.
-        */
-       return -EBUSY;
-}
-#else
 static int __remove_section(struct zone *zone, struct mem_section *ms)
 {
        int ret = -EINVAL;
@@ -456,7 +446,6 @@ static int __remove_section(struct zone *zone, struct mem_section *ms)
        sparse_remove_one_section(zone, ms);
        return 0;
 }
-#endif
 
 /*
  * Reasonably generic function for adding memory.  It is