Commit 1ad539b2 authored by Darren Hart's avatar Darren Hart Committed by Linus Torvalds
Browse files

[PATCH] vm: try_to_free_pages unused argument 



try_to_free_pages accepts a third argument, order, but hasn't used it since
before 2.6.0.  The following patch removes the argument and updates all the
calls to try_to_free_pages.

Signed-off-by: default avatarDarren Hart <dvhltc@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cbe37d09

fs/buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static void free_more_memory(void) 
	for_each_pgdat(pgdat) {

		zones = pgdat->node_zonelists[GFP_NOFS&GFP_ZONEMASK].zones;

		if (*zones)

			try_to_free_pages(zones, GFP_NOFS, 0);

			try_to_free_pages(zones, GFP_NOFS);

	}

}

include/linux/swap.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ extern int rotate_reclaimable_page(struct page *page); 
extern void swap_setup(void);



/* linux/mm/vmscan.c */

extern int try_to_free_pages(struct zone **, unsigned int, unsigned int);

extern int try_to_free_pages(struct zone **, unsigned int);

extern int zone_reclaim(struct zone *, unsigned int, unsigned int);

extern int shrink_all_memory(int);

extern int vm_swappiness;

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ __alloc_pages(unsigned int __nocast gfp_mask, unsigned int order, 
	reclaim_state.reclaimed_slab = 0;

	p->reclaim_state = &reclaim_state;



	did_some_progress = try_to_free_pages(zones, gfp_mask, order);

	did_some_progress = try_to_free_pages(zones, gfp_mask);



	p->reclaim_state = NULL;

	p->flags &= ~PF_MEMALLOC;

mm/vmscan.c

+1 −2
Original line number Diff line number Diff line
@@ -919,8 +919,7 @@ shrink_caches(struct zone **zones, struct scan_control *sc) 
 * holds filesystem locks which prevent writeout this might not work, and the

 * allocation attempt will fail.

 */

int try_to_free_pages(struct zone **zones,

		unsigned int gfp_mask, unsigned int order)

int try_to_free_pages(struct zone **zones, unsigned int gfp_mask)

{

	int priority;

	int ret = 0;