Patch "x86/mm/64: Rename the register_page_bootmem_memmap() 'size' parameter to 'nr_pages'" has been added to the 4.14-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
x86/mm/64: Rename the register_page_bootmem_memmap() 'size' parameter to 'nr_pages'
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-mm-64-rename-the-register_page_bootmem_memmap-size-parameter-to-nr_pages.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
15670bfe19905b1dcbb63137f40d718b59d84479Mon Sep 17 00:00:00 2001
From: Baoquan He <[email protected]>
Date: Sat, 28 Oct 2017 09:30:38 +0800
Subject: x86/mm/64: Rename the register_page_bootmem_memmap() 'size' parameter to 'nr_pages'
From: Baoquan He <[email protected]>
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.)
--- arch/x86/mm/init_64.c | 10 +++++----- include/linux/mm.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/mm/init_64.c +5 -5
@@ -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(unsignif (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 ); }
include/linux/mm.h +1 -1
@@ -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 ,
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/x86-mm-64-rename-the-register_page_bootmem_memmap-size-parameter-to-nr_pages.patch