summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-23 23:02:45 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-23 23:02:45 +0200
commit96ed753235c674a8cb261dac1a258cf6e50c6cd4 (patch)
treef9210625db82644ebcf88d1879288b2fc389d211 /include
parent37c72cac0e2ef9cd3c53dc9369a35dad6ef23f00 (diff)
parent71be2114a5474a76edad95343d89b8731457fccd (diff)
downloadlinux-96ed753235c674a8cb261dac1a258cf6e50c6cd4.tar.bz2
Merge branch 'freezer'
* freezer: PM / freezer: Clean up code after recent fixes PM: convert do_each_thread to for_each_process_thread OOM, PM: OOM killed task shouldn't escape PM suspend freezer: remove obsolete comments in __thaw_task() freezer: Do not freeze tasks killed by OOM killer
Diffstat (limited to 'include')
-rw-r--r--include/linux/oom.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 647395a1a550..e8d6e1058723 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -50,6 +50,9 @@ static inline bool oom_task_origin(const struct task_struct *p)
extern unsigned long oom_badness(struct task_struct *p,
struct mem_cgroup *memcg, const nodemask_t *nodemask,
unsigned long totalpages);
+
+extern int oom_kills_count(void);
+extern void note_oom_kill(void);
extern void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
unsigned int points, unsigned long totalpages,
struct mem_cgroup *memcg, nodemask_t *nodemask,