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

• Lines: 22
• Date: Mon Aug 7 21:01:36 2000
• Orig file: v2.4.0-test5/linux/mm/swapfile.c
• Orig date: Mon Jul 10 16:47:27 2000

diff -u --recursive --new-file v2.4.0-test5/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -315,10 +315,12 @@
 	 */
 	if (!mm)
 		return;
+	vmlist_access_lock(mm);
 	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);
 	return;
 }
 
@@ -643,7 +645,7 @@
 		goto bad_swap;
 	}
 
-	lock_page(mem_map + MAP_NR(swap_header));
+	lock_page(virt_to_page(swap_header));
 	rw_swap_page_nolock(READ, SWP_ENTRY(type,0), (char *) swap_header, 1);
 
 	if (!memcmp("SWAP-SPACE",swap_header->magic.magic,10))