summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2010-08-09 17:18:54 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 20:44:57 -0700
commit309ed882508cc471320ff79265e7340774d6746c (patch)
tree28321b30bc420c62554ef6a705ec4bc70651b473 /include
parent03668b3ceb0c7a95e09f1b6169f5270ffc1a19f6 (diff)
downloadkernel-common-309ed882508cc471320ff79265e7340774d6746c.tar.gz
kernel-common-309ed882508cc471320ff79265e7340774d6746c.tar.bz2
kernel-common-309ed882508cc471320ff79265e7340774d6746c.zip
oom: extract panic helper function
There are various points in the oom killer where the kernel must determine whether to panic or not. It's better to extract this to a helper function to remove all the confusion as to its semantics. Also fix a call to dump_header() where tasklist_lock is not read- locked, as required. There's no functional change with this patch. Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: David Rientjes <rientjes@google.com> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/oom.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 537662315627..3ae6d94d0540 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -22,6 +22,7 @@ enum oom_constraint {
CONSTRAINT_NONE,
CONSTRAINT_CPUSET,
CONSTRAINT_MEMORY_POLICY,
+ CONSTRAINT_MEMCG,
};
extern int try_set_zone_oom(struct zonelist *zonelist, gfp_t gfp_flags);