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

Commit c98940f6 authored by Yaowei Bai's avatar Yaowei Bai Committed by Linus Torvalds
Browse files

mm/memory_hotplug: is_mem_section_removable() can return bool 



Make is_mem_section_removable() return bool to improve readability due
to this particular function only using either one or zero as its return
value.

Signed-off-by: default avatarYaowei Bai <baiyaowei@cmss.chinamobile.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 32f6271d

include/linux/memory_hotplug.h

+3 −3
Original line number Diff line number Diff line
@@ -247,16 +247,16 @@ static inline void mem_hotplug_done(void) {} 


#ifdef CONFIG_MEMORY_HOTREMOVE



extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages);

extern bool is_mem_section_removable(unsigned long pfn, unsigned long nr_pages);

extern void try_offline_node(int nid);

extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);

extern void remove_memory(int nid, u64 start, u64 size);



#else

static inline int is_mem_section_removable(unsigned long pfn,

static inline bool is_mem_section_removable(unsigned long pfn,

					unsigned long nr_pages)

{

	return 0;

	return false;

}



static inline void try_offline_node(int nid) {}

mm/memory_hotplug.c

+3 −3
Original line number Diff line number Diff line
@@ -1410,7 +1410,7 @@ static struct page *next_active_pageblock(struct page *page) 
}



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

int is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages)

bool is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages)

{

	struct page *page = pfn_to_page(start_pfn);

	struct page *end_page = page + nr_pages;
@@ -1418,12 +1418,12 @@ int is_mem_section_removable(unsigned long start_pfn, unsigned long nr_pages) 
	/* Check the starting page of each pageblock within the range */

	for (; page < end_page; page = next_active_pageblock(page)) {

		if (!is_pageblock_removable_nolock(page))

			return 0;

			return false;

		cond_resched();

	}



	/* All pageblocks in the memory block are likely to be hot-removable */

	return 1;

	return true;

}



/*