diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 17:47:20 -0500 |
| commit | d7fc3ca1cd0ecce82263299c6b1631fc83b0ec79 (patch) | |
| tree | a6471779a25cf2794542f9441213f5aa5f337f2f /mm/vmscan.c | |
| parent | fbfda6e71bbdd3b4d41a56c3f20f31762c455a5e (diff) | |
| parent | ed62178589929d248a0aaf4018ca3867e2f96d9d (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index b0af7593d01e..7ccf763bb30b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
| @@ -1883,7 +1883,8 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order) | |||
| 1883 | 1883 | ||
| 1884 | if (!(gfp_mask & __GFP_WAIT) || | 1884 | if (!(gfp_mask & __GFP_WAIT) || |
| 1885 | zone->all_unreclaimable || | 1885 | zone->all_unreclaimable || |
| 1886 | atomic_read(&zone->reclaim_in_progress) > 0) | 1886 | atomic_read(&zone->reclaim_in_progress) > 0 || |
| 1887 | (p->flags & PF_MEMALLOC)) | ||
| 1887 | return 0; | 1888 | return 0; |
| 1888 | 1889 | ||
| 1889 | node_id = zone->zone_pgdat->node_id; | 1890 | node_id = zone->zone_pgdat->node_id; |