diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
| commit | 5205a16d8870cdd4cc524589de3e09ad176d129a (patch) | |
| tree | 6deddf1269b9e6f13f2fa00529cd4674c3b2a3fa /mm/vmscan.c | |
| parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) | |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 597a1b093..4e7ad6ab7 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -444,6 +444,7 @@ static int do_try_to_free_pages(unsigned int gfp_mask) int priority; int count = FREE_COUNT; int swap_count = 0; + int made_progress = 0; int ret = 0; /* Always trim SLAB caches when memory gets low. */ @@ -452,7 +453,7 @@ static int do_try_to_free_pages(unsigned int gfp_mask) priority = 64; do { while (shrink_mmap(priority, gfp_mask)) { - ret = 1; + made_progress = 1; if (!--count) goto done; } @@ -468,11 +469,11 @@ static int do_try_to_free_pages(unsigned int gfp_mask) count -= shrink_dcache_memory(priority, gfp_mask); count -= shrink_icache_memory(priority, gfp_mask); if (count <= 0) { - ret = 1; + made_progress = 1; goto done; } while (shm_swap(priority, gfp_mask)) { - ret = 1; + made_progress = 1; if (!--count) goto done; } @@ -493,11 +494,25 @@ static int do_try_to_free_pages(unsigned int gfp_mask) */ swap_count += count; while (swap_out(priority, gfp_mask)) { + made_progress = 1; if (--swap_count < 0) break; } - } while (--priority >= 0); + /* + * If we made progress at the current priority, the next + * loop will also be done at this priority level. There's + * absolutely no reason to drop to a lower priority and + * potentially upset the balance between shrink_mmap and + * swap_out. + */ + if (made_progress) { + made_progress = 0; + ret = 1; + } else { + priority--; + } + } while (priority >= 0); /* Always end on a shrink_mmap.. */ while (shrink_mmap(0, gfp_mask)) { |