HID: remove CVS keywords

[safe/jmp/linux-2.6] / include / linux / memcontrol.h

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 7d1f119..e660877 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -22,35 +22,146 @@
 
 struct mem_cgroup;
 struct page_cgroup;
+struct page;
+struct mm_struct;
 
-#ifdef CONFIG_CGROUP_MEM_CONT
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
+
+#define page_reset_bad_cgroup(page)    ((page)->page_cgroup = 0)
 
-extern void mm_init_cgroup(struct mm_struct *mm, struct task_struct *p);
-extern void mm_free_cgroup(struct mm_struct *mm);
-extern void page_assign_page_cgroup(struct page *page,
-                                       struct page_cgroup *pc);
 extern struct page_cgroup *page_get_page_cgroup(struct page *page);
+extern int mem_cgroup_charge(struct page *page, struct mm_struct *mm,
+                               gfp_t gfp_mask);
+extern int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm,
+                                       gfp_t gfp_mask);
+extern void mem_cgroup_uncharge_page(struct page *page);
+extern void mem_cgroup_move_lists(struct page *page, bool active);
+extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
+                                       struct list_head *dst,
+                                       unsigned long *scanned, int order,
+                                       int mode, struct zone *z,
+                                       struct mem_cgroup *mem_cont,
+                                       int active);
+extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask);
+int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem);
+
+extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
+
+#define mm_match_cgroup(mm, cgroup)    \
+       ((cgroup) == mem_cgroup_from_task((mm)->owner))
+
+extern int mem_cgroup_prepare_migration(struct page *page);
+extern void mem_cgroup_end_migration(struct page *page);
+extern void mem_cgroup_page_migration(struct page *page, struct page *newpage);
+
+/*
+ * For memory reclaim.
+ */
+extern int mem_cgroup_calc_mapped_ratio(struct mem_cgroup *mem);
+extern long mem_cgroup_reclaim_imbalance(struct mem_cgroup *mem);
+
+extern int mem_cgroup_get_reclaim_priority(struct mem_cgroup *mem);
+extern void mem_cgroup_note_reclaim_priority(struct mem_cgroup *mem,
+                                                       int priority);
+extern void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem,
+                                                       int priority);
 
-#else /* CONFIG_CGROUP_MEM_CONT */
-static inline void mm_init_cgroup(struct mm_struct *mm,
-                                       struct task_struct *p)
+extern long mem_cgroup_calc_reclaim_active(struct mem_cgroup *mem,
+                               struct zone *zone, int priority);
+extern long mem_cgroup_calc_reclaim_inactive(struct mem_cgroup *mem,
+                               struct zone *zone, int priority);
+
+#else /* CONFIG_CGROUP_MEM_RES_CTLR */
+static inline void page_reset_bad_cgroup(struct page *page)
 {
 }
 
-static inline void mm_free_cgroup(struct mm_struct *mm)
+static inline struct page_cgroup *page_get_page_cgroup(struct page *page)
 {
+       return NULL;
 }
 
-static inline void page_assign_page_cgroup(struct page *page,
-                                               struct page_cgroup *pc)
+static inline int mem_cgroup_charge(struct page *page,
+                                       struct mm_struct *mm, gfp_t gfp_mask)
 {
+       return 0;
 }
 
-static inline struct page_cgroup *page_get_page_cgroup(struct page *page)
+static inline int mem_cgroup_cache_charge(struct page *page,
+                                       struct mm_struct *mm, gfp_t gfp_mask)
 {
-       return NULL;
+       return 0;
+}
+
+static inline void mem_cgroup_uncharge_page(struct page *page)
+{
+}
+
+static inline void mem_cgroup_move_lists(struct page *page, bool active)
+{
+}
+
+static inline int mm_match_cgroup(struct mm_struct *mm, struct mem_cgroup *mem)
+{
+       return 1;
+}
+
+static inline int task_in_mem_cgroup(struct task_struct *task,
+                                    const struct mem_cgroup *mem)
+{
+       return 1;
+}
+
+static inline int mem_cgroup_prepare_migration(struct page *page)
+{
+       return 0;
 }
 
+static inline void mem_cgroup_end_migration(struct page *page)
+{
+}
+
+static inline void
+mem_cgroup_page_migration(struct page *page, struct page *newpage)
+{
+}
+
+static inline int mem_cgroup_calc_mapped_ratio(struct mem_cgroup *mem)
+{
+       return 0;
+}
+
+static inline int mem_cgroup_reclaim_imbalance(struct mem_cgroup *mem)
+{
+       return 0;
+}
+
+static inline int mem_cgroup_get_reclaim_priority(struct mem_cgroup *mem)
+{
+       return 0;
+}
+
+static inline void mem_cgroup_note_reclaim_priority(struct mem_cgroup *mem,
+                                               int priority)
+{
+}
+
+static inline void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem,
+                                               int priority)
+{
+}
+
+static inline long mem_cgroup_calc_reclaim_active(struct mem_cgroup *mem,
+                                       struct zone *zone, int priority)
+{
+       return 0;
+}
+
+static inline long mem_cgroup_calc_reclaim_inactive(struct mem_cgroup *mem,
+                                       struct zone *zone, int priority)
+{
+       return 0;
+}
 #endif /* CONFIG_CGROUP_MEM_CONT */
 
 #endif /* _LINUX_MEMCONTROL_H */