summaryrefslogtreecommitdiffstats
path: root/mm/memcontrol.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (incoming from Andrew)Linus Torvalds2014-01-221-7/+10
|\
| * memcg, oom: lock mem_cgroup_print_oom_infoMichal Hocko2014-01-221-5/+7
| * memcg: make memcg_update_cache_sizes() staticVladimir Davydov2014-01-221-1/+1
| * memcg: fix kmem_account_flags check in memcg_can_account_kmem()Vladimir Davydov2014-01-221-1/+2
* | Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2014-01-221-74/+352
|\ \ | |/ |/|
| * cgroup: replace cftype->read_seq_string() with cftype->seq_show()Tejun Heo2013-12-051-16/+12
| * memcg: convert away from cftype->read() and ->read_map()Tejun Heo2013-12-051-28/+21
| * cgroup: Merge branch 'memcg_event' into for-3.14Tejun Heo2013-11-231-32/+321
| |\
| | * memcg: rename cgroup_event to mem_cgroup_eventTejun Heo2013-11-231-20/+37
| | * memcg: make cgroup_event deal with mem_cgroup instead of cgroup_subsys_stateTejun Heo2013-11-231-31/+22
| | * memcg: remove cgroup_event->cftTejun Heo2013-11-231-30/+35
| | * cgroup, memcg: move cgroup->event_list[_lock] and event callbacks into memcgTejun Heo2013-11-231-27/+60
| | * memcg: cgroup_write_event_control() now knows @css is for memcgTejun Heo2013-11-231-16/+11
| | * cgroup, memcg: move cgroup_event implementation to memcgTejun Heo2013-11-231-0/+248
* | | memcg: fix memcg_size() calculationVladimir Davydov2014-01-021-1/+1
* | | mm: memcg: do not allow task about to OOM kill to bypass the limitJohannes Weiner2013-12-131-1/+1
* | | mm: memcg: fix race condition between memcg teardown and swapinJohannes Weiner2013-12-131-0/+36
* | | mm: memcg: do not declare OOM from __GFP_NOFAIL allocationsJohannes Weiner2013-12-131-0/+3
|/ /
* | mm, thp: change pmd_trans_huge_lock() to return taken lockKirill A. Shutemov2013-11-151-5/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-11-131-3/+3
|\ \
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-11-041-31/+26
| |\|
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-10-231-88/+55
| |\ \
| * | | tcp_memcontrol: Kill struct tcp_memcontrolEric W. Biederman2013-10-221-3/+3
* | | | Merge branch 'akpm' (patches from Andrew Morton)Linus Torvalds2013-11-131-49/+48
|\ \ \ \
| * | | | memcg, kmem: use cache_from_memcg_idx instead of hard codeQiang Huang2013-11-131-6/+6
| * | | | memcg, kmem: use is_root_cache instead of hard codeQiang Huang2013-11-131-1/+2
| * | | | memcg: support hierarchical memory.numa_statsYing Han2013-11-131-0/+17
| * | | | memcg: refactor mem_control_numa_stat_show()Greg Thelen2013-11-131-34/+22
| * | | | mm: add a helper function to check may oom conditionQiang Huang2013-11-131-8/+1
| | |_|/ | |/| |
* | | | Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2013-11-131-26/+40
|\ \ \ \ | |/ / / |/| | |
| * | | memcg: stop using css idLi Zefan2013-09-241-16/+8
| * | | memcg: fail to create cgroup if the cgroup id is too bigLi Zefan2013-09-241-0/+9
| * | | memcg: convert to use cgroup idLi Zefan2013-09-241-10/+22
| * | | memcg: convert to use cgroup_is_descendant()Li Zefan2013-09-241-1/+1
* | | | memcg: remove incorrect underflow checkGreg Thelen2013-11-011-1/+0
* | | | mm: memcg: fix test for child groupsJohannes Weiner2013-11-011-24/+11
* | | | mm: memcg: lockdep annotation for memcg OOM lockJohannes Weiner2013-11-011-1/+10
* | | | mm: memcg: use proper memcg in limit bypassJohannes Weiner2013-11-011-4/+4
* | | | memcg: use __this_cpu_sub() to dec stats to avoid incorrect subtrahend castingGreg Thelen2013-10-301-1/+1
| |_|/ |/| |
* | | fs: buffer: move allocation failure loop into the allocatorJohannes Weiner2013-10-171-0/+2
* | | mm: memcg: handle non-error OOM situations more gracefullyJohannes Weiner2013-10-171-88/+51
* | | mm, memcg: protect mem_cgroup_read_events for cpu hotplugDavid Rientjes2013-10-171-0/+2
| |/ |/|
* | revert "memcg, vmscan: integrate soft reclaim tighter with zone shrinking code"Andrew Morton2013-09-251-21/+142
* | revert "memcg: get rid of soft-limit tree infrastructure"Andrew Morton2013-09-251-2/+263
* | revert "vmscan, memcg: do softlimit reclaim also for targeted reclaim"Andrew Morton2013-09-251-9/+5
* | revert "memcg: enhance memcg iterator to support predicates"Andrew Morton2013-09-251-55/+15
* | revert "memcg: track children in soft limit excess to improve soft limit"Andrew Morton2013-09-251-71/+0
* | revert "memcg, vmscan: do not attempt soft limit reclaim if it would not scan...Andrew Morton2013-09-251-5/+1
* | revert "memcg: track all children over limit in the root"Andrew Morton2013-09-251-9/+0
|/
* memcg: add per cgroup writeback pages accountingSha Zhengju2013-09-131-7/+23