patch-2.4.10 linux/mm/oom_kill.c

Next file: linux/mm/page_alloc.c
Previous file: linux/mm/numa.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/mm/oom_kill.c linux/mm/oom_kill.c
@@ -192,43 +192,3 @@
 	schedule();
 	return;
 }
-
-/**
- * out_of_memory - is the system out of memory?
- *
- * Returns 0 if there is still enough memory left,
- * 1 when we are out of memory (otherwise).
- */
-int out_of_memory(void)
-{
-	long cache_mem, limit;
-
-	/* Enough free memory?  Not OOM. */
-	if (nr_free_pages() > freepages.min)
-		return 0;
-
-	if (nr_free_pages() + nr_inactive_clean_pages() > freepages.low)
-		return 0;
-
-	/*
-	 * If the buffer and page cache (excluding swap cache) are over
-	 * their (/proc tunable) minimum, we're still not OOM.  We test
-	 * this to make sure we don't return OOM when the system simply
-	 * has a hard time with the cache.
-	 */
-	cache_mem = atomic_read(&page_cache_size);
-	cache_mem += atomic_read(&buffermem_pages);
-	cache_mem -= swapper_space.nrpages;
-	limit = (page_cache.min_percent + buffer_mem.min_percent);
-	limit *= num_physpages / 100;
-
-	if (cache_mem > limit)
-		return 0;
-
-	/* Enough swap space left?  Not OOM. */
-	if (nr_swap_pages > 0)
-		return 0;
-
-	/* Else... */
-	return 1;
-}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)