Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / mm / vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 0655d5fe73e82c164043bf99958397602d6846c7..db023e2ff3852f544c6a4b0f8cb3b43ecd0d456b 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -952,7 +952,7 @@ static unsigned long shrink_zone(int priority, struct zone *zone,
                }
        }
 
-       throttle_vm_writeout();
+       throttle_vm_writeout(sc->gfp_mask);
 
        atomic_dec(&zone->reclaim_in_progress);
        return nr_reclaimed;