diff options
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 1e11df8fa7ec..bbf405a3a18f 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -565,7 +565,7 @@ bool oom_zonelist_trylock(struct zonelist *zonelist, gfp_t gfp_mask) | |||
565 | 565 | ||
566 | spin_lock(&zone_scan_lock); | 566 | spin_lock(&zone_scan_lock); |
567 | for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) | 567 | for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) |
568 | if (zone_is_oom_locked(zone)) { | 568 | if (test_bit(ZONE_OOM_LOCKED, &zone->flags)) { |
569 | ret = false; | 569 | ret = false; |
570 | goto out; | 570 | goto out; |
571 | } | 571 | } |
@@ -575,7 +575,7 @@ bool oom_zonelist_trylock(struct zonelist *zonelist, gfp_t gfp_mask) | |||
575 | * call to oom_zonelist_trylock() doesn't succeed when it shouldn't. | 575 | * call to oom_zonelist_trylock() doesn't succeed when it shouldn't. |
576 | */ | 576 | */ |
577 | for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) | 577 | for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) |
578 | zone_set_flag(zone, ZONE_OOM_LOCKED); | 578 | set_bit(ZONE_OOM_LOCKED, &zone->flags); |
579 | 579 | ||
580 | out: | 580 | out: |
581 | spin_unlock(&zone_scan_lock); | 581 | spin_unlock(&zone_scan_lock); |
@@ -594,7 +594,7 @@ void oom_zonelist_unlock(struct zonelist *zonelist, gfp_t gfp_mask) | |||
594 | 594 | ||
595 | spin_lock(&zone_scan_lock); | 595 | spin_lock(&zone_scan_lock); |
596 | for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) | 596 | for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) |
597 | zone_clear_flag(zone, ZONE_OOM_LOCKED); | 597 | clear_bit(ZONE_OOM_LOCKED, &zone->flags); |
598 | spin_unlock(&zone_scan_lock); | 598 | spin_unlock(&zone_scan_lock); |
599 | } | 599 | } |
600 | 600 | ||