diff -urN 2.4.0-test4-pre6/mm/highmem.c vm-25/mm/highmem.c
--- 2.4.0-test4-pre6/mm/highmem.c	Sat May 27 07:47:10 2000
+++ vm-25/mm/highmem.c	Fri Jul 14 18:42:03 2000
@@ -86,9 +88,8 @@
 	copy_page((void *)vaddr, (void *)page_address(page));
 	kunmap(highpage);
 
-	/* Preserve the caching of the swap_entry. */
-	highpage->index = page->index;
-	highpage->mapping = page->mapping;
+	if (page->mapping)
+		BUG();
 
 	/*
 	 * We can just forget the old page since