From 6c2a553dbeab49c7f4e44de3b53f4fb78a5f4e32 Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
Date: Wed, 21 Mar 2012 16:34:22 -0700
Subject: [PATCH] --- yaml --- r: 292684 b: refs/heads/master c:
 a710920caedfcf56543136bfea300a6c593f9838 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/include/linux/memcontrol.h | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 3bab5d4a162a..7258c4f713bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b24028572fb69e9dd6de8c359eba2b2c66baa889
+refs/heads/master: a710920caedfcf56543136bfea300a6c593f9838
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index e76f10731a86..c54e5dfa1962 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -299,21 +299,6 @@ static inline void mem_cgroup_iter_break(struct mem_cgroup *root,
 {
 }
 
-static inline int mem_cgroup_get_reclaim_priority(struct mem_cgroup *memcg)
-{
-	return 0;
-}
-
-static inline void mem_cgroup_note_reclaim_priority(struct mem_cgroup *memcg,
-						int priority)
-{
-}
-
-static inline void mem_cgroup_record_reclaim_priority(struct mem_cgroup *memcg,
-						int priority)
-{
-}
-
 static inline bool mem_cgroup_disabled(void)
 {
 	return true;