Commit e5408417 authored by Muchun Song's avatar Muchun Song Committed by Linus Torvalds
Browse files

mm: sparsemem: move vmemmap related to HugeTLB to CONFIG_HUGETLB_PAGE_FREE_VMEMMAP 

The vmemmap_remap_free/alloc are relevant to HugeTLB, so move those
functiongs to the scope of CONFIG_HUGETLB_PAGE_FREE_VMEMMAP.

Link: https://lkml.kernel.org/r/20211101031651.75851-6-songmuchun@bytedance.com


Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarBarry Song <song.bao.hua@hisilicon.com>
Cc: Bodeddula Balasubramaniam <bodeddub@amazon.com>
Cc: Chen Huang <chenhuang5@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Fam Zheng <fam.zheng@bytedance.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Xiongchun Duan <duanxiongchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b147c89c

include/linux/mm.h

+2 −0
Original line number Diff line number Diff line
@@ -3146,10 +3146,12 @@ static inline void print_vma_addr(char *prefix, unsigned long rip) 
}

#endif



#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP

int vmemmap_remap_free(unsigned long start, unsigned long end,

		       unsigned long reuse);

int vmemmap_remap_alloc(unsigned long start, unsigned long end,

			unsigned long reuse, gfp_t gfp_mask);

#endif



void *sparse_buffer_alloc(unsigned long size);

struct page * __populate_section_memmap(unsigned long pfn,

mm/sparse-vmemmap.c

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/pgalloc.h>

#include <asm/tlbflush.h>



#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP

/**

 * struct vmemmap_remap_walk - walk vmemmap page table

 *
@@ -419,6 +420,7 @@ int vmemmap_remap_alloc(unsigned long start, unsigned long end, 


	return 0;

}

#endif /* CONFIG_HUGETLB_PAGE_FREE_VMEMMAP */



/*

 * Allocate a block of memory to be used to back the virtual memory map