lkml.org 
[lkml]   [2019]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/4] mm/sparse: Rename function related to section memmap allocation/free
    Date
    These functions are used to allocate/free section memmap, have nothing
    to do with kmalloc/free during the handling. Rename them to remove
    the confusion.

    Signed-off-by: Baoquan He <bhe@redhat.com>
    Acked-by: Mike Rapoport <rppt@linux.ibm.com>
    ---
    mm/sparse.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/mm/sparse.c b/mm/sparse.c
    index f4f34d69131e..68a89d133fa7 100644
    --- a/mm/sparse.c
    +++ b/mm/sparse.c
    @@ -590,13 +590,13 @@ void offline_mem_sections(unsigned long start_pfn, unsigned long end_pfn)
    #endif

    #ifdef CONFIG_SPARSEMEM_VMEMMAP
    -static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid,
    +static inline struct page *alloc_section_memmap(unsigned long pnum, int nid,
    struct vmem_altmap *altmap)
    {
    /* This will make the necessary allocations eventually. */
    return sparse_mem_map_populate(pnum, nid, altmap);
    }
    -static void __kfree_section_memmap(struct page *memmap,
    +static void __free_section_memmap(struct page *memmap,
    struct vmem_altmap *altmap)
    {
    unsigned long start = (unsigned long)memmap;
    @@ -614,7 +614,7 @@ static void free_map_bootmem(struct page *memmap)
    }
    #endif /* CONFIG_MEMORY_HOTREMOVE */
    #else
    -static struct page *__kmalloc_section_memmap(void)
    +static struct page *__alloc_section_memmap(void)
    {
    struct page *page, *ret;
    unsigned long memmap_size = sizeof(struct page) * PAGES_PER_SECTION;
    @@ -635,13 +635,13 @@ static struct page *__kmalloc_section_memmap(void)
    return ret;
    }

    -static inline struct page *kmalloc_section_memmap(unsigned long pnum, int nid,
    +static inline struct page *alloc_section_memmap(unsigned long pnum, int nid,
    struct vmem_altmap *altmap)
    {
    - return __kmalloc_section_memmap();
    + return __alloc_section_memmap();
    }

    -static void __kfree_section_memmap(struct page *memmap,
    +static void __free_section_memmap(struct page *memmap,
    struct vmem_altmap *altmap)
    {
    if (is_vmalloc_addr(memmap))
    @@ -722,7 +722,7 @@ int __meminit sparse_add_one_section(int nid, unsigned long start_pfn,
    usemap = __kmalloc_section_usemap();
    if (!usemap)
    return -ENOMEM;
    - memmap = kmalloc_section_memmap(section_nr, nid, altmap);
    + memmap = alloc_section_memmap(section_nr, nid, altmap);
    if (!memmap) {
    kfree(usemap);
    return -ENOMEM;
    @@ -786,7 +786,7 @@ static void free_section_usemap(struct page *memmap, unsigned long *usemap,
    if (PageSlab(usemap_page) || PageCompound(usemap_page)) {
    kfree(usemap);
    if (memmap)
    - __kfree_section_memmap(memmap, altmap);
    + __free_section_memmap(memmap, altmap);
    return;
    }

    --
    2.17.2
    \
     
     \ /
      Last update: 2019-03-26 10:03    [W:2.144 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site