aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/page_alloc.c2
-rw-r--r--mm/vmscan.c3
2 files changed, 2 insertions, 3 deletions
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;