diff --git a/[refs] b/[refs] index f6b929fda609..f414d7035df7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e21c8f145f5052c1c2fb4a4b41bee01c848159b +refs/heads/master: c3dce2d89c269d5373a120d4a22fc2426ec992b0 diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c index 28c6cf96d3c4..f5a6966b7eb0 100644 --- a/trunk/mm/rmap.c +++ b/trunk/mm/rmap.c @@ -527,6 +527,8 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma) * If the page is mlock()d, we cannot swap it out. * If it's recently referenced (perhaps page_referenced * skipped over this mm) then we should reactivate it. + * + * Pages belonging to VM_RESERVED regions should not happen here. */ if ((vma->vm_flags & (VM_LOCKED|VM_RESERVED)) || ptep_clear_flush_young(vma, address, pte)) {