aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/buffer.c2
-rw-r--r--include/linux/swap.h2
-rw-r--r--mm/page_alloc.c2
-rw-r--r--mm/vmscan.c3
4 files changed, 4 insertions, 5 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 7e9e409feaa7..0befa724ab98 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -528,7 +528,7 @@ static void free_more_memory(void)
528 for_each_pgdat(pgdat) { 528 for_each_pgdat(pgdat) {
529 zones = pgdat->node_zonelists[GFP_NOFS&GFP_ZONEMASK].zones; 529 zones = pgdat->node_zonelists[GFP_NOFS&GFP_ZONEMASK].zones;
530 if (*zones) 530 if (*zones)
531 try_to_free_pages(zones, GFP_NOFS, 0); 531 try_to_free_pages(zones, GFP_NOFS);
532 } 532 }
533} 533}
534 534
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 0d21e682d99d..2343f999e6e1 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -172,7 +172,7 @@ extern int rotate_reclaimable_page(struct page *page);
172extern void swap_setup(void); 172extern void swap_setup(void);
173 173
174/* linux/mm/vmscan.c */ 174/* linux/mm/vmscan.c */
175extern int try_to_free_pages(struct zone **, unsigned int, unsigned int); 175extern int try_to_free_pages(struct zone **, unsigned int);
176extern int zone_reclaim(struct zone *, unsigned int, unsigned int); 176extern int zone_reclaim(struct zone *, unsigned int, unsigned int);
177extern int shrink_all_memory(int); 177extern int shrink_all_memory(int);
178extern int vm_swappiness; 178extern int vm_swappiness;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 95cbd30a67b8..70f710286ced 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -859,7 +859,7 @@ rebalance:
859 reclaim_state.reclaimed_slab = 0; 859 reclaim_state.reclaimed_slab = 0;
860 p->reclaim_state = &reclaim_state; 860 p->reclaim_state = &reclaim_state;
861 861
862 did_some_progress = try_to_free_pages(zones, gfp_mask, order); 862 did_some_progress = try_to_free_pages(zones, gfp_mask);
863 863
864 p->reclaim_state = NULL; 864 p->reclaim_state = NULL;
865 p->flags &= ~PF_MEMALLOC; 865 p->flags &= ~PF_MEMALLOC;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 24da725a30f0..4b8e62a19370 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -919,8 +919,7 @@ shrink_caches(struct zone **zones, struct scan_control *sc)
919 * holds filesystem locks which prevent writeout this might not work, and the 919 * holds filesystem locks which prevent writeout this might not work, and the
920 * allocation attempt will fail. 920 * allocation attempt will fail.
921 */ 921 */
922int try_to_free_pages(struct zone **zones, 922int try_to_free_pages(struct zone **zones, unsigned int gfp_mask)
923 unsigned int gfp_mask, unsigned int order)
924{ 923{
925 int priority; 924 int priority;
926 int ret = 0; 925 int ret = 0;