patch-2.4.0-test9 linux/mm/memory.c

• Lines: 28
• Date: Fri Sep 15 16:51:21 2000
• Orig file: v2.4.0-test8/linux/mm/memory.c
• Orig date: Fri Sep 1 13:51:10 2000

diff -u --recursive --new-file v2.4.0-test8/linux/mm/memory.c linux/mm/memory.c
@@ -67,7 +67,7 @@
 	copy_user_highpage(to, from, address);
 }
 
-mem_map_t * mem_map = NULL;
+mem_map_t * mem_map;
 
 /*
  * Note: this doesn't free the actual pages themselves. That
@@ -1040,7 +1040,8 @@
 	num = valid_swaphandles(entry, &offset);
 	for (i = 0; i < num; offset++, i++) {
 		/* Don't block on I/O for read-ahead */
-		if (atomic_read(&nr_async_pages) >= pager_daemon.swap_cluster) {
+		if (atomic_read(&nr_async_pages) >= pager_daemon.swap_cluster
+				* (1 << page_cluster)) {
 			while (i++ < num)
 				swap_free(SWP_ENTRY(SWP_TYPE(entry), offset++));
 			break;
@@ -1239,7 +1240,7 @@
 
 	pgd = pgd_offset(mm, address);
 	pmd = pmd_alloc(pgd, address);
-	
+
 	if (pmd) {
 		pte_t * pte = pte_alloc(pmd, address);
 		if (pte)