summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-28 14:01:14 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-08-28 14:01:14 +0200
commitcd69a7d503c0a8788ef898d2f6192dece2eab71c (patch)
treeed921bf9c00d4e846012bfca911355543afacb83 /mm
parentb4acb0b697c678bba8262082b9274d11c341ed90 (diff)
parentf1244df11a400707e8bbd25927d4e199ef2fbbdd (diff)
downloadlwn-cd69a7d503c0a8788ef898d2f6192dece2eab71c.tar.gz
lwn-cd69a7d503c0a8788ef898d2f6192dece2eab71c.zip
Merge branch 'rt/base' into rt/head
Diffstat (limited to 'mm')
-rw-r--r--mm/rmap.c1
-rw-r--r--mm/vmscan.c9
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;
/*