diff options
-rw-r--r-- | 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 d9bba82923d5..183a964ca61b 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 | ||
509 | out: | 507 | out: |
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 |