diff --git a/mm/oom_kill.c b/mm/oom_kill.c index d9bba82923d5f70aa8d373afc128ed4e25e8121e..183a964ca61b0f01399851757110f09c4b434196 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(); read_lock(&tasklist_lock); switch (constraint) { @@ -495,7 +494,6 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) /* Found nothing?!?! Either we hang forever, or we panic. */ if (!p) { read_unlock(&tasklist_lock); - cpuset_unlock(); panic("Out of memory and no killable processes...\n"); } @@ -508,7 +506,6 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) out: read_unlock(&tasklist_lock); - cpuset_unlock(); /* * Give "p" a good chance of killing itself before we