update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 8a47b4e..49b45da 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1118,12 +1118,12 @@ no_new_page:
 static inline void unmap_mapping_range_list(struct prio_tree_root *root,
                                            struct zap_details *details)
 {
-       struct vm_area_struct *vma = NULL;
+       struct vm_area_struct *vma;
        struct prio_tree_iter iter;
        pgoff_t vba, vea, zba, zea;
 
-       while ((vma = vma_prio_tree_next(vma, root, &iter,
-                       details->first_index, details->last_index)) != NULL) {
+       vma_prio_tree_foreach(vma, &iter, root,
+                       details->first_index, details->last_index) {
                vba = vma->vm_pgoff;
                vea = vba + ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) - 1;
                /* Assume for now that PAGE_CACHE_SHIFT == PAGE_SHIFT */
@@ -1346,6 +1346,7 @@ static int do_swap_page(struct mm_struct * mm,
                /* Had to read the page from swap area: Major fault */
                ret = VM_FAULT_MAJOR;
                inc_page_state(pgmajfault);
+               grab_swap_token();
        }
 
        mark_page_accessed(page);