aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/oom.h2
-rw-r--r--mm/oom_kill.c4
-rw-r--r--mm/page_alloc.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 1a8e407a1a53..9d7c34a741e7 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -25,7 +25,7 @@ enum oom_constraint {
25 CONSTRAINT_MEMCG, 25 CONSTRAINT_MEMCG,
26}; 26};
27 27
28extern int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_flags); 28extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
29extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags); 29extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
30 30
31extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, 31extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 2f37f6113d9e..c29cf00d9084 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -549,7 +549,7 @@ EXPORT_SYMBOL_GPL(unregister_oom_notifier);
549 * if a parallel OOM killing is already taking place that includes a zone in 549 * if a parallel OOM killing is already taking place that includes a zone in
550 * the zonelist. Otherwise, locks all zones in the zonelist and returns 1. 550 * the zonelist. Otherwise, locks all zones in the zonelist and returns 1.
551 */ 551 */
552int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask) 552int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_mask)
553{ 553{
554 struct zoneref *z; 554 struct zoneref *z;
555 struct zone *zone; 555 struct zone *zone;
@@ -566,7 +566,7 @@ int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
566 for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) { 566 for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
567 /* 567 /*
568 * Lock each zone in the zonelist under zone_scan_lock so a 568 * Lock each zone in the zonelist under zone_scan_lock so a
569 * parallel invocation of try_set_zone_oom() doesn't succeed 569 * parallel invocation of try_set_zonelist_oom() doesn't succeed
570 * when it shouldn't. 570 * when it shouldn't.
571 */ 571 */
572 zone_set_flag(zone, ZONE_OOM_LOCKED); 572 zone_set_flag(zone, ZONE_OOM_LOCKED);
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 527f73e4c63f..33c6b4c1277b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1738,7 +1738,7 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
1738 struct page *page; 1738 struct page *page;
1739 1739
1740 /* Acquire the OOM killer lock for the zones in zonelist */ 1740 /* Acquire the OOM killer lock for the zones in zonelist */
1741 if (!try_set_zone_oom(zonelist, gfp_mask)) { 1741 if (!try_set_zonelist_oom(zonelist, gfp_mask)) {
1742 schedule_timeout_uninterruptible(1); 1742 schedule_timeout_uninterruptible(1);
1743 return NULL; 1743 return NULL;
1744 } 1744 }