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

Commit b745bc85 authored Jun 04, 2014 by Mel Gorman Committed by Linus Torvalds Jun 04, 2014

mm: page_alloc: convert hot/cold parameter and immediate callers to bool

cold is a bool, make it one.  Make the likely case the "if" part of the
block instead of the else as according to the optimisation manual this is
preferred.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Acked-by: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Jan Kara <jack@suse.cz>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 7aeb09f9

arch/tile/mm/homecache.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -417,7 +417,7 @@ void __homecache_free_pages(struct page *page, unsigned int order)
	if (put_page_testzero(page)) {		if (put_page_testzero(page)) {
	homecache_change_page_home(page, order, PAGE_HOME_HASH);		homecache_change_page_home(page, order, PAGE_HOME_HASH);
	if (order == 0) {		if (order == 0) {
	free_hot_cold_page(page, 0);		free_hot_cold_page(page, false);
	} else {		} else {
	init_page_count(page);		init_page_count(page);
	__free_pages(page, order);		__free_pages(page, order);

fs/fuse/dev.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1614,7 +1614,7 @@ static int fuse_notify_store(struct fuse_conn *fc, unsigned int size,

	static void fuse_retrieve_end(struct fuse_conn fc, struct fuse_req req)		static void fuse_retrieve_end(struct fuse_conn fc, struct fuse_req req)
	{		{
	release_pages(req->pages, req->num_pages, 0);		release_pages(req->pages, req->num_pages, false);
	}		}

	static int fuse_retrieve(struct fuse_conn fc, struct inode inode,		static int fuse_retrieve(struct fuse_conn fc, struct inode inode,

include/linux/gfp.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -371,8 +371,8 @@ void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask);

	extern void __free_pages(struct page *page, unsigned int order);		extern void __free_pages(struct page *page, unsigned int order);
	extern void free_pages(unsigned long addr, unsigned int order);		extern void free_pages(unsigned long addr, unsigned int order);
	extern void free_hot_cold_page(struct page *page, int cold);		extern void free_hot_cold_page(struct page *page, bool cold);
	extern void free_hot_cold_page_list(struct list_head *list, int cold);		extern void free_hot_cold_page_list(struct list_head *list, bool cold);

	extern void __free_kmem_pages(struct page *page, unsigned int order);		extern void __free_kmem_pages(struct page *page, unsigned int order);
	extern void free_kmem_pages(unsigned long addr, unsigned int order);		extern void free_kmem_pages(unsigned long addr, unsigned int order);

include/linux/pagemap.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,7 @@ static inline void mapping_set_gfp_mask(struct address_space *m, gfp_t mask)

	#define page_cache_get(page) get_page(page)		#define page_cache_get(page) get_page(page)
	#define page_cache_release(page) put_page(page)		#define page_cache_release(page) put_page(page)
	void release_pages(struct page **pages, int nr, int cold);		void release_pages(struct page **pages, int nr, bool cold);

	/*		/*
	* speculatively take a reference to a page.		* speculatively take a reference to a page.

include/linux/swap.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -477,7 +477,7 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
	#define free_page_and_swap_cache(page) \		#define free_page_and_swap_cache(page) \
	page_cache_release(page)		page_cache_release(page)
	#define free_pages_and_swap_cache(pages, nr) \		#define free_pages_and_swap_cache(pages, nr) \
	release_pages((pages), (nr), 0);		release_pages((pages), (nr), false);

	static inline void show_swap_cache_info(void)		static inline void show_swap_cache_info(void)
	{		{