From a6ed5379865e8ccee1c409d52600c6944a806d03 Mon Sep 17 00:00:00 2001 From: Andrew Chant Date: Mon, 8 Apr 2019 21:15:30 -0700 Subject: [PATCH] Revert "mm, oom: check LMK enabled for pagefault_out_of_memory()" This reverts commit 94c0e1ab2c98bdcd96795d10cf4cc5718b0a6310. We will not use in-kernel LMK any longer so do not make divergent from upstream unnecessary. Bug: 129765516 Change-Id: I2cb3d156de1305ba517e9544679634b2e7fe0fc5 Signed-off-by: Andrew Chant Signed-off-by: Pranav Vashi --- mm/oom_kill.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 278bcf67cb22..0fd4258d3582 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -1087,9 +1087,6 @@ void pagefault_out_of_memory(void) static DEFINE_RATELIMIT_STATE(pfoom_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); - if (IS_ENABLED(CONFIG_HAVE_LOW_MEMORY_KILLER)) - return; - if (mem_cgroup_oom_synchronize(true)) return;