aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2007-10-17 02:25:58 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:46 -0400
commit3ff566963ce804809af9e32331b287eedeeff501 (patch)
treedd71c5613b27e8c309d7bbe48798e6cd5c4145cc /mm
parentbbe373f2c60b2aa36c3231734a5afc5271a06718 (diff)
oom: do not take callback_mutex
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>
Diffstat (limited to 'mm')
-rw-r--r--mm/oom_kill.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index d9bba82923d..183a964ca61 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -463,7 +463,6 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
463 * NUMA) that may require different handling. 463 * NUMA) that may require different handling.
464 */ 464 */
465 constraint = constrained_alloc(zonelist, gfp_mask); 465 constraint = constrained_alloc(zonelist, gfp_mask);
466 cpuset_lock();
467 read_lock(&tasklist_lock); 466 read_lock(&tasklist_lock);
468 467
469 switch (constraint) { 468 switch (constraint) {
@@ -495,7 +494,6 @@ retry:
495 /* Found nothing?!?! Either we hang forever, or we panic. */ 494 /* Found nothing?!?! Either we hang forever, or we panic. */
496 if (!p) { 495 if (!p) {
497 read_unlock(&tasklist_lock); 496 read_unlock(&tasklist_lock);
498 cpuset_unlock();
499 panic("Out of memory and no killable processes...\n"); 497 panic("Out of memory and no killable processes...\n");
500 } 498 }
501 499
@@ -508,7 +506,6 @@ retry:
508 506
509out: 507out:
510 read_unlock(&tasklist_lock); 508 read_unlock(&tasklist_lock);
511 cpuset_unlock();
512 509
513 /* 510 /*
514 * Give "p" a good chance of killing itself before we 511 * Give "p" a good chance of killing itself before we