diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-28 13:59:31 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-28 13:59:31 +0200 |
| commit | f1244df11a400707e8bbd25927d4e199ef2fbbdd (patch) | |
| tree | 8e0ef6a9defa6cc87835ba74cfd04b1ca3351a9e /mm | |
| parent | 9e6d9c5e5889ce8fde5afc5066c5825a3d52114d (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
| download | lwn-f1244df11a400707e8bbd25927d4e199ef2fbbdd.tar.gz lwn-f1244df11a400707e8bbd25927d4e199ef2fbbdd.zip | |
Merge branch 'linus' into rt/base
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/rmap.c | 1 | ||||
| -rw-r--r-- | mm/vmscan.c | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mm/rmap.c b/mm/rmap.c index 836c6c63e1f2..0895b5c7cbff 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -358,6 +358,7 @@ static int page_referenced_one(struct page *page, */ if (vma->vm_flags & VM_LOCKED) { *mapcount = 1; /* break early from loop */ + *vm_flags |= VM_LOCKED; goto out_unmap; } diff --git a/mm/vmscan.c b/mm/vmscan.c index 6911d54ff9c8..9360c3e6d124 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -631,9 +631,14 @@ static unsigned long shrink_page_list(struct list_head *page_list, referenced = page_referenced(page, 1, sc->mem_cgroup, &vm_flags); - /* In active use or really unfreeable? Activate it. */ + /* + * In active use or really unfreeable? Activate it. + * If page which have PG_mlocked lost isoltation race, + * try_to_unmap moves it to unevictable list + */ if (sc->order <= PAGE_ALLOC_COSTLY_ORDER && - referenced && page_mapping_inuse(page)) + referenced && page_mapping_inuse(page) + && !(vm_flags & VM_LOCKED)) goto activate_locked; /* |