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;