diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /mm/vmscan.c | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index d3dfb8db6..f00e9c535 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -45,7 +45,7 @@ static int try_to_swap_out(struct vm_area_struct* vma, unsigned long address, pt if (!pte_present(pte)) goto out_failed; page = pte_page(pte); - if (page-mem_map >= max_mapnr) + if ((page-mem_map >= max_mapnr) || PageReserved(page)) goto out_failed; /* Don't look at this pte if it's been accessed recently. */ @@ -59,7 +59,7 @@ static int try_to_swap_out(struct vm_area_struct* vma, unsigned long address, pt goto out_failed; } - if (PageReserved(page) || PageLocked(page)) + if (PageLocked(page)) goto out_failed; /* |