Commit e03d1f78 authored by Pingfan Liu's avatar Pingfan Liu Committed by Linus Torvalds

mm/sparse: rename pfn_present() to pfn_in_present_section()

After introducing mem sub section concept, pfn_present() loses its literal
meaning, and will not be necessary a truth on partial populated mem
section.

Since all of the callers use it to judge an absent section, it is better
to rename pfn_present() as pfn_in_present_section().
Signed-off-by: default avatarPingfan Liu <kernelfans@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>		[powerpc]
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Leonardo Bras <leonardo@linux.ibm.com>
Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Cc: Nathan Lynch <nathanl@linux.ibm.com>
Link: http://lkml.kernel.org/r/1581919110-29575-1-git-send-email-kernelfans@gmail.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4627d76d
...@@ -360,7 +360,7 @@ static bool lmb_is_removable(struct drmem_lmb *lmb) ...@@ -360,7 +360,7 @@ static bool lmb_is_removable(struct drmem_lmb *lmb)
for (i = 0; i < scns_per_block; i++) { for (i = 0; i < scns_per_block; i++) {
pfn = PFN_DOWN(phys_addr); pfn = PFN_DOWN(phys_addr);
if (!pfn_present(pfn)) { if (!pfn_in_present_section(pfn)) {
phys_addr += MIN_MEMORY_BLOCK_SIZE; phys_addr += MIN_MEMORY_BLOCK_SIZE;
continue; continue;
} }
......
...@@ -772,7 +772,7 @@ static int register_mem_sect_under_node(struct memory_block *mem_blk, ...@@ -772,7 +772,7 @@ static int register_mem_sect_under_node(struct memory_block *mem_blk,
* memory block could have several absent sections from start. * memory block could have several absent sections from start.
* skip pfn range from absent section * skip pfn range from absent section
*/ */
if (!pfn_present(pfn)) { if (!pfn_in_present_section(pfn)) {
pfn = round_down(pfn + PAGES_PER_SECTION, pfn = round_down(pfn + PAGES_PER_SECTION,
PAGES_PER_SECTION) - 1; PAGES_PER_SECTION) - 1;
continue; continue;
......
...@@ -1374,7 +1374,7 @@ static inline int pfn_valid(unsigned long pfn) ...@@ -1374,7 +1374,7 @@ static inline int pfn_valid(unsigned long pfn)
} }
#endif #endif
static inline int pfn_present(unsigned long pfn) static inline int pfn_in_present_section(unsigned long pfn)
{ {
if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS) if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)
return 0; return 0;
...@@ -1411,7 +1411,7 @@ void sparse_init(void); ...@@ -1411,7 +1411,7 @@ void sparse_init(void);
#else #else
#define sparse_init() do {} while (0) #define sparse_init() do {} while (0)
#define sparse_index_init(_sec, _nid) do {} while (0) #define sparse_index_init(_sec, _nid) do {} while (0)
#define pfn_present pfn_valid #define pfn_in_present_section pfn_valid
#define subsection_map_init(_pfn, _nr_pages) do {} while (0) #define subsection_map_init(_pfn, _nr_pages) do {} while (0)
#endif /* CONFIG_SPARSEMEM */ #endif /* CONFIG_SPARSEMEM */
......
...@@ -304,7 +304,7 @@ static int __meminit online_page_ext(unsigned long start_pfn, ...@@ -304,7 +304,7 @@ static int __meminit online_page_ext(unsigned long start_pfn,
} }
for (pfn = start; !fail && pfn < end; pfn += PAGES_PER_SECTION) { for (pfn = start; !fail && pfn < end; pfn += PAGES_PER_SECTION) {
if (!pfn_present(pfn)) if (!pfn_in_present_section(pfn))
continue; continue;
fail = init_section_page_ext(pfn, nid); fail = init_section_page_ext(pfn, nid);
} }
......
...@@ -72,7 +72,7 @@ static struct page * __meminit shuffle_valid_page(unsigned long pfn, int order) ...@@ -72,7 +72,7 @@ static struct page * __meminit shuffle_valid_page(unsigned long pfn, int order)
return NULL; return NULL;
/* ...is the pfn in a present section or a hole? */ /* ...is the pfn in a present section or a hole? */
if (!pfn_present(pfn)) if (!pfn_in_present_section(pfn))
return NULL; return NULL;
/* ...is the page free and currently on a free_area list? */ /* ...is the page free and currently on a free_area list? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment