[PATCH 2/2] use oom_killer_disabled in page fault oom path

[Dave Young]

Currently oom_killer_disabled is only used in __alloc_pages_slowpath,
For page fault oom case it is not considered. One use case is
virtio balloon driver, when memory pressure is high, virtio ballooning
will cause oom killing due to such as page fault oom.

Thus add oom_killer_disabled checking in pagefault_out_of_memory.

Signed-off-by: Dave Young <hidave.darkstar@xxxxxxxxx>
---
 mm/oom_kill.c |    3 +++
 1 file changed, 3 insertions(+)

--- linux-2.6.orig/mm/oom_kill.c	2011-04-26 11:32:21.446452686 +0800
+++ linux-2.6/mm/oom_kill.c	2011-04-26 11:33:05.426452586 +0800
@@ -747,6 +747,9 @@ out:
  */
 void pagefault_out_of_memory(void)
 {
+	if (oom_killer_disabled)
+		return;
+
 	if (try_set_system_oom()) {
 		out_of_memory(NULL, 0, 0, NULL);
 		clear_system_oom();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/