patch-2.4.0-test10 linux/mm/swapfile.c

• Lines: 28
• Date: Wed Oct 18 14:25:46 2000
• Orig file: v2.4.0-test9/linux/mm/swapfile.c
• Orig date: Mon Aug 7 21:01:36 2000

diff -u --recursive --new-file v2.4.0-test9/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -223,10 +223,10 @@
 		if (pte_page(pte) != page)
 			return;
 		/* We will be removing the swap cache in a moment, so... */
-		set_pte(dir, pte_mkdirty(pte));
+		ptep_mkdirty(dir);
 		return;
 	}
-	if (pte_val(pte) != entry.val)
+	if (pte_to_swp_entry(pte).val != entry.val)
 		return;
 	set_pte(dir, pte_mkdirty(mk_pte(page, vma->vm_page_prot)));
 	swap_free(entry);
@@ -315,12 +315,12 @@
 	 */
 	if (!mm)
 		return;
-	vmlist_access_lock(mm);
+	spin_lock(&mm->page_table_lock);
 	for (vma = mm->mmap; vma; vma = vma->vm_next) {
 		pgd_t * pgd = pgd_offset(mm, vma->vm_start);
 		unuse_vma(vma, pgd, entry, page);
 	}
-	vmlist_access_unlock(mm);
+	spin_unlock(&mm->page_table_lock);
 	return;
 }