From 64d77588f91f55b76a71277ce4c481c0ee592c56 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hughd@google.com>
Date: Wed, 21 Mar 2012 16:34:19 -0700
Subject: [PATCH] --- yaml --- r: 292678 b: refs/heads/master c:
 1f2b71f41ee81735c25ef326da9a0610d640abc2 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 90b8d5f8b2d3..58a93e9b7a91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f156ab9333c7810f8c4b1a0413142f52534b2df1
+refs/heads/master: 1f2b71f41ee81735c25ef326da9a0610d640abc2
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 7572a5089d63..43a9ade724c7 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -1391,7 +1391,6 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
 	if (!memcg || !p)
 		return;
 
-
 	rcu_read_lock();
 
 	mem_cgrp = memcg->css.cgroup;
@@ -1926,7 +1925,6 @@ void mem_cgroup_update_page_stat(struct page *page,
 	if (unlikely(need_unlock))
 		move_unlock_page_cgroup(pc, &flags);
 	rcu_read_unlock();
-	return;
 }
 EXPORT_SYMBOL(mem_cgroup_update_page_stat);
 
@@ -2912,7 +2910,6 @@ static void mem_cgroup_do_uncharge(struct mem_cgroup *memcg,
 		res_counter_uncharge(&memcg->memsw, nr_pages * PAGE_SIZE);
 	if (unlikely(batch->memcg != memcg))
 		memcg_oom_recover(memcg);
-	return;
 }
 
 /*
@@ -3937,7 +3934,6 @@ static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg,
 out:
 	*mem_limit = min_limit;
 	*memsw_limit = min_memsw_limit;
-	return;
 }
 
 static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)