patch-2.1.57 linux/mm/vmscan.c

• Lines: 31
• Date: Sun Sep 21 17:05:45 1997
• Orig file: v2.1.56/linux/mm/vmscan.c
• Orig date: Wed Sep 3 20:52:44 1997

diff -u --recursive --new-file v2.1.56/linux/mm/vmscan.c linux/mm/vmscan.c
@@ -355,6 +355,9 @@
 	int i=6;
 	int stop;
 
+	/* Always trim SLAB caches when memory gets low. */
+	(void) kmem_cache_reap(0, dma, wait);
+
 	/* we don't try as hard if we're not waiting.. */
 	stop = 3;
 	if (wait)
@@ -366,19 +369,9 @@
 				return 1;
 			state = 1;
 		case 1:
-			/*
-			 * We shouldn't have a priority here:
-			 * If we're low on memory we should
-			 * unconditionally throw away _all_
-			 * kmalloc caches!
-			 */
-			if (kmem_cache_reap(0, dma, wait))
-				return 1;
-			state = 2;
-		case 2:
 			if (shm_swap(i, dma))
 				return 1;
-			state = 3;
+			state = 2;
 		default:
 			if (swap_out(i, dma, wait))
 				return 1;