lkml.org 
[lkml]   [2017]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 030/159] x86/mm/64: Rename the register_page_bootmem_memmap() size parameter to nr_pages
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Baoquan He <bhe@redhat.com>

    commit 15670bfe19905b1dcbb63137f40d718b59d84479 upstream.

    register_page_bootmem_memmap()'s 3rd 'size' parameter is named
    in a somewhat misleading fashion - rename it to 'nr_pages' which
    makes the units of it much clearer.

    Meanwhile rename the existing local variable 'nr_pages' to
    'nr_pmd_pages', a more expressive name, to avoid conflict with
    new function parameter 'nr_pages'.

    (Also clean up the unnecessary parentheses in which get_order() is called.)

    Signed-off-by: Baoquan He <bhe@redhat.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: akpm@linux-foundation.org
    Link: http://lkml.kernel.org/r/1509154238-23250-1-git-send-email-bhe@redhat.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/mm/init_64.c | 10 +++++-----
    include/linux/mm.h | 2 +-
    2 files changed, 6 insertions(+), 6 deletions(-)

    --- a/arch/x86/mm/init_64.c
    +++ b/arch/x86/mm/init_64.c
    @@ -1426,16 +1426,16 @@ int __meminit vmemmap_populate(unsigned

    #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE)
    void register_page_bootmem_memmap(unsigned long section_nr,
    - struct page *start_page, unsigned long size)
    + struct page *start_page, unsigned long nr_pages)
    {
    unsigned long addr = (unsigned long)start_page;
    - unsigned long end = (unsigned long)(start_page + size);
    + unsigned long end = (unsigned long)(start_page + nr_pages);
    unsigned long next;
    pgd_t *pgd;
    p4d_t *p4d;
    pud_t *pud;
    pmd_t *pmd;
    - unsigned int nr_pages;
    + unsigned int nr_pmd_pages;
    struct page *page;

    for (; addr < end; addr = next) {
    @@ -1482,9 +1482,9 @@ void register_page_bootmem_memmap(unsign
    if (pmd_none(*pmd))
    continue;

    - nr_pages = 1 << (get_order(PMD_SIZE));
    + nr_pmd_pages = 1 << get_order(PMD_SIZE);
    page = pmd_page(*pmd);
    - while (nr_pages--)
    + while (nr_pmd_pages--)
    get_page_bootmem(section_nr, page++,
    SECTION_INFO);
    }
    --- a/include/linux/mm.h
    +++ b/include/linux/mm.h
    @@ -2510,7 +2510,7 @@ void vmemmap_populate_print_last(void);
    void vmemmap_free(unsigned long start, unsigned long end);
    #endif
    void register_page_bootmem_memmap(unsigned long section_nr, struct page *map,
    - unsigned long size);
    + unsigned long nr_pages);

    enum mf_flags {
    MF_COUNT_INCREASED = 1 << 0,

    \
     
     \ /
      Last update: 2017-12-22 10:57    [W:4.040 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site