diff options
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r-- | include/linux/memcontrol.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 3914e3dd6168..9b15a4bcfa77 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -484,7 +484,8 @@ bool mem_cgroup_oom_synchronize(bool wait); | |||
484 | extern int do_swap_account; | 484 | extern int do_swap_account; |
485 | #endif | 485 | #endif |
486 | 486 | ||
487 | void lock_page_memcg(struct page *page); | 487 | struct mem_cgroup *lock_page_memcg(struct page *page); |
488 | void __unlock_page_memcg(struct mem_cgroup *memcg); | ||
488 | void unlock_page_memcg(struct page *page); | 489 | void unlock_page_memcg(struct page *page); |
489 | 490 | ||
490 | static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, | 491 | static inline unsigned long memcg_page_state(struct mem_cgroup *memcg, |
@@ -809,7 +810,12 @@ mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) | |||
809 | { | 810 | { |
810 | } | 811 | } |
811 | 812 | ||
812 | static inline void lock_page_memcg(struct page *page) | 813 | static inline struct mem_cgroup *lock_page_memcg(struct page *page) |
814 | { | ||
815 | return NULL; | ||
816 | } | ||
817 | |||
818 | static inline void __unlock_page_memcg(struct mem_cgroup *memcg) | ||
813 | { | 819 | { |
814 | } | 820 | } |
815 | 821 | ||