diff options
Diffstat (limited to 'include/linux/memcontrol.h')
| -rw-r--r-- | include/linux/memcontrol.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9411d32840b0..159a0762aeaf 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
| @@ -98,11 +98,6 @@ extern void mem_cgroup_end_migration(struct mem_cgroup *mem, | |||
| 98 | /* | 98 | /* |
| 99 | * For memory reclaim. | 99 | * For memory reclaim. |
| 100 | */ | 100 | */ |
| 101 | extern int mem_cgroup_get_reclaim_priority(struct mem_cgroup *mem); | ||
| 102 | extern void mem_cgroup_note_reclaim_priority(struct mem_cgroup *mem, | ||
| 103 | int priority); | ||
| 104 | extern void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem, | ||
| 105 | int priority); | ||
| 106 | int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg); | 101 | int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg); |
| 107 | int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg); | 102 | int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg); |
| 108 | unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, | 103 | unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, |
| @@ -128,8 +123,9 @@ static inline bool mem_cgroup_disabled(void) | |||
| 128 | 123 | ||
| 129 | void mem_cgroup_update_file_mapped(struct page *page, int val); | 124 | void mem_cgroup_update_file_mapped(struct page *page, int val); |
| 130 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, | 125 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, |
| 131 | gfp_t gfp_mask, int nid, | 126 | gfp_t gfp_mask); |
| 132 | int zid); | 127 | u64 mem_cgroup_get_limit(struct mem_cgroup *mem); |
| 128 | |||
| 133 | #else /* CONFIG_CGROUP_MEM_RES_CTLR */ | 129 | #else /* CONFIG_CGROUP_MEM_RES_CTLR */ |
| 134 | struct mem_cgroup; | 130 | struct mem_cgroup; |
| 135 | 131 | ||
| @@ -304,7 +300,13 @@ static inline void mem_cgroup_update_file_mapped(struct page *page, | |||
| 304 | 300 | ||
| 305 | static inline | 301 | static inline |
| 306 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, | 302 | unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, |
| 307 | gfp_t gfp_mask, int nid, int zid) | 303 | gfp_t gfp_mask) |
| 304 | { | ||
| 305 | return 0; | ||
| 306 | } | ||
| 307 | |||
| 308 | static inline | ||
| 309 | u64 mem_cgroup_get_limit(struct mem_cgroup *mem) | ||
| 308 | { | 310 | { |
| 309 | return 0; | 311 | return 0; |
| 310 | } | 312 | } |
