summaryrefslogtreecommitdiffstats
path: root/mm/oom_kill.c
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2015-06-25 01:57:04 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-25 02:49:43 +0200
commit3f5ab8cfbf15e8e02838ffc3549191351305df0e (patch)
treed9f2e3695da695bbe11e7741e9cd9fc2d5f4d009 /mm/oom_kill.c
parentmm/memory hotplug: init the zone's size when calculating node totalpages (diff)
downloadlinux-3f5ab8cfbf15e8e02838ffc3549191351305df0e.tar.xz
linux-3f5ab8cfbf15e8e02838ffc3549191351305df0e.zip
mm: oom_kill: remove unnecessary locking in oom_enable()
Setting oom_killer_disabled to false is atomic, there is no need for further synchronization with ongoing allocations trying to OOM-kill. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Acked-by: David Rientjes <rientjes@google.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Dave Chinner <david@fromorbit.com> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--mm/oom_kill.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 2b665da1b3c9..73763e489e86 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -488,9 +488,7 @@ bool oom_killer_disable(void)
*/
void oom_killer_enable(void)
{
- down_write(&oom_sem);
oom_killer_disabled = false;
- up_write(&oom_sem);
}
#define K(x) ((x) << (PAGE_SHIFT-10))