fuse: extend FUSE_SETXATTR request

[linux-2.6-microblaze.git] / mm / mlock.c

diff --git a/mm/mlock.c b/mm/mlock.c
index 55b3b36..f8f8cc3 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -278,8 +278,7 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone)
                         */
                        if (TestClearPageLRU(page)) {
                                lruvec = relock_page_lruvec_irq(page, lruvec);
-                               del_page_from_lru_list(page, lruvec,
-                                                       page_lru(page));
+                               del_page_from_lru_list(page, lruvec);
                                continue;
                        } else
                                __munlock_isolation_failed(page);
@@ -623,7 +622,7 @@ static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm,
 
        vma = find_vma(mm, start);
        if (vma == NULL)
-               vma = mm->mmap;
+               return 0;
 
        for (; vma ; vma = vma->vm_next) {
                if (start >= vma->vm_end)