From 0364694aa8a743106bfe9c713994511516c42bea Mon Sep 17 00:00:00 2001
From: Minchan Kim <minchan.kim@gmail.com>
Date: Mon, 9 Aug 2010 17:18:57 -0700
Subject: [PATCH] --- yaml --- r: 207219 b: refs/heads/master c:
 ff321feac22313cf53ffceb69224b09ac19ff22b h: refs/heads/master i:   207217:
 564d3bde23da4db082cc53dc5b996ff250175a2b   207215:
 f2a7a3f99bb7b34e15307d69bfe2b720823c8132 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/oom.h | 2 +-
 trunk/mm/oom_kill.c       | 4 ++--
 trunk/mm/page_alloc.c     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 338718ca0d6a..ebe6b422dc11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b940fd703572f7f9e5f894c682c91c3cbd84c11e
+refs/heads/master: ff321feac22313cf53ffceb69224b09ac19ff22b
diff --git a/trunk/include/linux/oom.h b/trunk/include/linux/oom.h
index 1a8e407a1a53..9d7c34a741e7 100644
--- a/trunk/include/linux/oom.h
+++ b/trunk/include/linux/oom.h
@@ -25,7 +25,7 @@ enum oom_constraint {
 	CONSTRAINT_MEMCG,
 };
 
-extern int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_flags);
+extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
 extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
 
 extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
diff --git a/trunk/mm/oom_kill.c b/trunk/mm/oom_kill.c
index 2f37f6113d9e..c29cf00d9084 100644
--- a/trunk/mm/oom_kill.c
+++ b/trunk/mm/oom_kill.c
@@ -549,7 +549,7 @@ EXPORT_SYMBOL_GPL(unregister_oom_notifier);
  * if a parallel OOM killing is already taking place that includes a zone in
  * the zonelist.  Otherwise, locks all zones in the zonelist and returns 1.
  */
-int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
+int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_mask)
 {
 	struct zoneref *z;
 	struct zone *zone;
@@ -566,7 +566,7 @@ int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_mask)
 	for_each_zone_zonelist(zone, z, zonelist, gfp_zone(gfp_mask)) {
 		/*
 		 * Lock each zone in the zonelist under zone_scan_lock so a
-		 * parallel invocation of try_set_zone_oom() doesn't succeed
+		 * parallel invocation of try_set_zonelist_oom() doesn't succeed
 		 * when it shouldn't.
 		 */
 		zone_set_flag(zone, ZONE_OOM_LOCKED);
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 527f73e4c63f..33c6b4c1277b 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1738,7 +1738,7 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order,
 	struct page *page;
 
 	/* Acquire the OOM killer lock for the zones in zonelist */
-	if (!try_set_zone_oom(zonelist, gfp_mask)) {
+	if (!try_set_zonelist_oom(zonelist, gfp_mask)) {
 		schedule_timeout_uninterruptible(1);
 		return NULL;
 	}