Commit:     3ff566963ce804809af9e32331b287eedeeff501
Parent:     bbe373f2c60b2aa36c3231734a5afc5271a06718
Author:     David Rientjes <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:25:58 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:42:46 2007 -0700

    oom: do not take callback_mutex
    Since no task descriptor's 'cpuset' field is dereferenced in the execution 
    the OOM killer anymore, it is no longer necessary to take callback_mutex.
    [EMAIL PROTECTED]: restore cpuset_lock for other patches]
    Cc: Andrea Arcangeli <[EMAIL PROTECTED]>
    Acked-by: Christoph Lameter <[EMAIL PROTECTED]>
    Signed-off-by: David Rientjes <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 mm/oom_kill.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index d9bba82..183a964 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)
         * NUMA) that may require different handling.
        constraint = constrained_alloc(zonelist, gfp_mask);
-       cpuset_lock();
        switch (constraint) {
@@ -495,7 +494,6 @@ retry:
                /* Found nothing?!?! Either we hang forever, or we panic. */
                if (!p) {
-                       cpuset_unlock();
                        panic("Out of memory and no killable processes...\n");
@@ -508,7 +506,6 @@ retry:
-       cpuset_unlock();
         * Give "p" a good chance of killing itself before we
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to