patch-2.4.25 linux-2.4.25/mm/vmscan.c

Next file: linux-2.4.25/net/8021q/vlan.c
Previous file: linux-2.4.25/mm/page_alloc.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.24/mm/vmscan.c linux-2.4.25/mm/vmscan.c
@@ -649,6 +649,9 @@
 				failed_swapout = !swap_out(classzone);
 		} while (--tries);
 
+#ifdef	CONFIG_OOM_KILLER
+	out_of_memory();
+#else
 	if (likely(current->pid != 1))
 		break;
 	if (!check_classzone_need_balance(classzone))
@@ -656,6 +659,7 @@
 
 	__set_current_state(TASK_RUNNING);
 	yield();
+#endif
 	}
 
 	return 0;

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