diff options
| author | Andrew Morton | 2013-09-25 00:27:41 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-09-25 02:00:26 +0200 |
| commit | 0608f43da64a1f1c42507304b5f25bc8b1227aa4 (patch) | |
| tree | 3138a251439bee1f12bd176f41f3fc63e194f455 /include/linux/memcontrol.h | |
| parent | revert "memcg: get rid of soft-limit tree infrastructure" (diff) | |
| download | kernel-qcow2-linux-0608f43da64a1f1c42507304b5f25bc8b1227aa4.tar.gz kernel-qcow2-linux-0608f43da64a1f1c42507304b5f25bc8b1227aa4.tar.xz kernel-qcow2-linux-0608f43da64a1f1c42507304b5f25bc8b1227aa4.zip | |
revert "memcg, vmscan: integrate soft reclaim tighter with zone shrinking code"
Revert commit 3b38722efd9f ("memcg, vmscan: integrate soft reclaim
tighter with zone shrinking code")
I merged this prematurely - Michal and Johannes still disagree about the
overall design direction and the future remains unclear.
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/memcontrol.h')
| -rw-r--r-- | include/linux/memcontrol.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 6054c9f3a5e8..ecc82b37c4cc 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -234,7 +234,9 @@ static inline void mem_cgroup_dec_page_stat(struct page *page, mem_cgroup_update_page_stat(page, idx, -1); } -bool mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg); +unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, + gfp_t gfp_mask, + unsigned long *total_scanned); void __mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx); static inline void mem_cgroup_count_vm_event(struct mm_struct *mm, @@ -434,9 +436,11 @@ static inline void mem_cgroup_dec_page_stat(struct page *page, } static inline -bool mem_cgroup_soft_reclaim_eligible(struct mem_cgroup *memcg) +unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, + gfp_t gfp_mask, + unsigned long *total_scanned) { - return false; + return 0; } static inline void mem_cgroup_split_huge_fixup(struct page *head) |