lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oom: do not take callback_mutex

Browse Source 
Since no task descriptor's 'cpuset' field is dereferenced in the execution of
the OOM killer anymore, it is no longer necessary to take callback_mutex.

[akpm@linux-foundation.org: restore cpuset_lock for other patches]
Cc: Andrea Arcangeli <andrea@suse.de>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Rientjes
2007-10-16 23:25:58 -07:00
committed by Linus Torvalds
parent bbe373f2c6
commit 3ff566963c
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mm/oom_kill.c
View File

@@ -463,7 +463,6 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
* NUMA) that may require different handling. * NUMA) that may require different handling.
*/ */
constraint = constrained_alloc(zonelist, gfp_mask); constraint = constrained_alloc(zonelist, gfp_mask);
cpuset_lock();
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
switch (constraint) { switch (constraint) {
@@ -495,7 +494,6 @@ retry:
/* Found nothing?!?! Either we hang forever, or we panic. */ /* Found nothing?!?! Either we hang forever, or we panic. */
if (!p) { if (!p) {
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
cpuset_unlock();
panic("Out of memory and no killable processes...\n"); panic("Out of memory and no killable processes...\n");
} }
@@ -508,7 +506,6 @@ retry:
out: out:
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
cpuset_unlock();
/* /*
* Give "p" a good chance of killing itself before we * Give "p" a good chance of killing itself before we