Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb52bbae authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Linus Torvalds
Browse files

mm: move is_pageblock_removable_nolock() to mm/memory_hotplug.c 

is_pageblock_removable_nolock() is not used outside of
mm/memory_hotplug.c.  Move it next to unique caller
is_mem_section_removable() and make it static.

Remove prototype in <linux/memory_hotplug.h> to silence gcc warning (W=1):

  mm/page_alloc.c:7704:6: warning: no previous prototype for `is_pageblock_removable_nolock' [-Wmissing-prototypes]

Link: http://lkml.kernel.org/r/20180509190001.24789-1-malat@debian.org


Signed-off-by: default avatarMathieu Malaterre <malat@debian.org>
Suggested-by: default avatarMichal Hocko <mhocko@kernel.org>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ab6ecf24

include/linux/memory_hotplug.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ static inline bool movable_node_is_enabled(void) 
}



#ifdef CONFIG_MEMORY_HOTREMOVE

extern bool is_pageblock_removable_nolock(struct page *page);

extern int arch_remove_memory(u64 start, u64 size,

		struct vmem_altmap *altmap);

extern int __remove_pages(struct zone *zone, unsigned long start_pfn,

mm/memory_hotplug.c

+23 −0
Original line number Diff line number Diff line
@@ -1237,6 +1237,29 @@ static struct page *next_active_pageblock(struct page *page) 
	return page + pageblock_nr_pages;

}



static bool is_pageblock_removable_nolock(struct page *page)

{

	struct zone *zone;

	unsigned long pfn;



	/*

	 * We have to be careful here because we are iterating over memory

	 * sections which are not zone aware so we might end up outside of

	 * the zone but still within the section.

	 * We have to take care about the node as well. If the node is offline

	 * its NODE_DATA will be NULL - see page_zone.

	 */

	if (!node_online(page_to_nid(page)))

		return false;



	zone = page_zone(page);

	pfn = page_to_pfn(page);

	if (!zone_spans_pfn(zone, pfn))

		return false;



	return !has_unmovable_pages(zone, page, 0, MIGRATE_MOVABLE, true);

}



/* Checks if this range of memory is likely to be hot-removable. */

bool is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages)

{

mm/page_alloc.c

+0 −23
Original line number Diff line number Diff line
@@ -7692,29 +7692,6 @@ bool has_unmovable_pages(struct zone *zone, struct page *page, int count, 
	return true;

}



bool is_pageblock_removable_nolock(struct page *page)

{

	struct zone *zone;

	unsigned long pfn;



	/*

	 * We have to be careful here because we are iterating over memory

	 * sections which are not zone aware so we might end up outside of

	 * the zone but still within the section.

	 * We have to take care about the node as well. If the node is offline

	 * its NODE_DATA will be NULL - see page_zone.

	 */

	if (!node_online(page_to_nid(page)))

		return false;



	zone = page_zone(page);

	pfn = page_to_pfn(page);

	if (!zone_spans_pfn(zone, pfn))

		return false;



	return !has_unmovable_pages(zone, page, 0, MIGRATE_MOVABLE, true);

}



#if (defined(CONFIG_MEMORY_ISOLATION) && defined(CONFIG_COMPACTION)) || defined(CONFIG_CMA)



static unsigned long pfn_max_align_down(unsigned long pfn)