diff options
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r-- | include/linux/memcontrol.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index e6608776bc96..84ead2aa6f18 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -50,9 +50,10 @@ extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); | |||
50 | #define mm_match_cgroup(mm, cgroup) \ | 50 | #define mm_match_cgroup(mm, cgroup) \ |
51 | ((cgroup) == mem_cgroup_from_task((mm)->owner)) | 51 | ((cgroup) == mem_cgroup_from_task((mm)->owner)) |
52 | 52 | ||
53 | extern int mem_cgroup_prepare_migration(struct page *page); | 53 | extern int |
54 | mem_cgroup_prepare_migration(struct page *page, struct page *newpage); | ||
54 | extern void mem_cgroup_end_migration(struct page *page); | 55 | extern void mem_cgroup_end_migration(struct page *page); |
55 | extern void mem_cgroup_page_migration(struct page *page, struct page *newpage); | 56 | extern int mem_cgroup_getref(struct page *page); |
56 | 57 | ||
57 | /* | 58 | /* |
58 | * For memory reclaim. | 59 | * For memory reclaim. |
@@ -112,7 +113,8 @@ static inline int task_in_mem_cgroup(struct task_struct *task, | |||
112 | return 1; | 113 | return 1; |
113 | } | 114 | } |
114 | 115 | ||
115 | static inline int mem_cgroup_prepare_migration(struct page *page) | 116 | static inline int |
117 | mem_cgroup_prepare_migration(struct page *page, struct page *newpage) | ||
116 | { | 118 | { |
117 | return 0; | 119 | return 0; |
118 | } | 120 | } |
@@ -121,8 +123,7 @@ static inline void mem_cgroup_end_migration(struct page *page) | |||
121 | { | 123 | { |
122 | } | 124 | } |
123 | 125 | ||
124 | static inline void | 126 | static inline void mem_cgroup_getref(struct page *page) |
125 | mem_cgroup_page_migration(struct page *page, struct page *newpage) | ||
126 | { | 127 | { |
127 | } | 128 | } |
128 | 129 | ||