aboutsummaryrefslogtreecommitdiffstats
path: root/mm/sparse.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/sparse.c')
-rw-r--r--mm/sparse.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/sparse.c b/mm/sparse.c
index fd13166949b5..d1d5e05f5b8d 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -604,7 +604,6 @@ static void __kfree_section_memmap(struct page *memmap,
604 604
605 vmemmap_free(start, end, altmap); 605 vmemmap_free(start, end, altmap);
606} 606}
607#ifdef CONFIG_MEMORY_HOTREMOVE
608static void free_map_bootmem(struct page *memmap) 607static void free_map_bootmem(struct page *memmap)
609{ 608{
610 unsigned long start = (unsigned long)memmap; 609 unsigned long start = (unsigned long)memmap;
@@ -612,7 +611,6 @@ static void free_map_bootmem(struct page *memmap)
612 611
613 vmemmap_free(start, end, NULL); 612 vmemmap_free(start, end, NULL);
614} 613}
615#endif /* CONFIG_MEMORY_HOTREMOVE */
616#else 614#else
617static struct page *__kmalloc_section_memmap(void) 615static struct page *__kmalloc_section_memmap(void)
618{ 616{
@@ -651,7 +649,6 @@ static void __kfree_section_memmap(struct page *memmap,
651 get_order(sizeof(struct page) * PAGES_PER_SECTION)); 649 get_order(sizeof(struct page) * PAGES_PER_SECTION));
652} 650}
653 651
654#ifdef CONFIG_MEMORY_HOTREMOVE
655static void free_map_bootmem(struct page *memmap) 652static void free_map_bootmem(struct page *memmap)
656{ 653{
657 unsigned long maps_section_nr, removing_section_nr, i; 654 unsigned long maps_section_nr, removing_section_nr, i;
@@ -681,7 +678,6 @@ static void free_map_bootmem(struct page *memmap)
681 put_page_bootmem(page); 678 put_page_bootmem(page);
682 } 679 }
683} 680}
684#endif /* CONFIG_MEMORY_HOTREMOVE */
685#endif /* CONFIG_SPARSEMEM_VMEMMAP */ 681#endif /* CONFIG_SPARSEMEM_VMEMMAP */
686 682
687/** 683/**
@@ -746,7 +742,6 @@ out:
746 return ret; 742 return ret;
747} 743}
748 744
749#ifdef CONFIG_MEMORY_HOTREMOVE
750#ifdef CONFIG_MEMORY_FAILURE 745#ifdef CONFIG_MEMORY_FAILURE
751static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) 746static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
752{ 747{
@@ -823,5 +818,4 @@ void sparse_remove_one_section(struct zone *zone, struct mem_section *ms,
823 PAGES_PER_SECTION - map_offset); 818 PAGES_PER_SECTION - map_offset);
824 free_section_usemap(memmap, usemap, altmap); 819 free_section_usemap(memmap, usemap, altmap);
825} 820}
826#endif /* CONFIG_MEMORY_HOTREMOVE */
827#endif /* CONFIG_MEMORY_HOTPLUG */ 821#endif /* CONFIG_MEMORY_HOTPLUG */