aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memcontrol.h
diff options
context:
space:
mode:
authorPavel Emelianov <xemul@openvz.org>2008-02-07 03:13:58 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:19 -0500
commitc7ba5c9e8176704bfac0729875fa62798037584d (patch)
tree00df1c4cb67e313cdb66233381b4cee275fd46c0 /include/linux/memcontrol.h
parent0eea10301708c64a6b793894c156e21ddd15eb64 (diff)
Memory controller: OOM handling
Out of memory handling for cgroups over their limit. A task from the cgroup over limit is chosen using the existing OOM logic and killed. TODO: 1. As discussed in the OLS BOF session, consider implementing a user space policy for OOM handling. [akpm@linux-foundation.org: fix build due to oom-killer changes] Signed-off-by: Pavel Emelianov <xemul@openvz.org> Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Paul Menage <menage@google.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Kirill Korotaev <dev@sw.ru> Cc: Herbert Poetzl <herbert@13thfloor.at> Cc: David Rientjes <rientjes@google.com> Cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> 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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 9c3c1c97c197..9bbbf524ba8f 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -39,6 +39,7 @@ extern unsigned long mem_cgroup_isolate_pages(unsigned long nr_to_scan,
39 int mode, struct zone *z, 39 int mode, struct zone *z,
40 struct mem_cgroup *mem_cont, 40 struct mem_cgroup *mem_cont,
41 int active); 41 int active);
42extern void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask);
42 43
43static inline void mem_cgroup_uncharge_page(struct page *page) 44static inline void mem_cgroup_uncharge_page(struct page *page)
44{ 45{