diff options
Diffstat (limited to 'include/linux/oom.h')
| -rw-r--r-- | include/linux/oom.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h index 83469522690a..606137b3b778 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h | |||
| @@ -23,6 +23,9 @@ struct oom_control { | |||
| 23 | /* Used to determine mempolicy */ | 23 | /* Used to determine mempolicy */ |
| 24 | nodemask_t *nodemask; | 24 | nodemask_t *nodemask; |
| 25 | 25 | ||
| 26 | /* Memory cgroup in which oom is invoked, or NULL for global oom */ | ||
| 27 | struct mem_cgroup *memcg; | ||
| 28 | |||
| 26 | /* Used to determine cpuset and node locality requirement */ | 29 | /* Used to determine cpuset and node locality requirement */ |
| 27 | const gfp_t gfp_mask; | 30 | const gfp_t gfp_mask; |
| 28 | 31 | ||
| @@ -83,14 +86,13 @@ extern unsigned long oom_badness(struct task_struct *p, | |||
| 83 | 86 | ||
| 84 | extern void oom_kill_process(struct oom_control *oc, struct task_struct *p, | 87 | extern void oom_kill_process(struct oom_control *oc, struct task_struct *p, |
| 85 | unsigned int points, unsigned long totalpages, | 88 | unsigned int points, unsigned long totalpages, |
| 86 | struct mem_cgroup *memcg, const char *message); | 89 | const char *message); |
| 87 | 90 | ||
| 88 | extern void check_panic_on_oom(struct oom_control *oc, | 91 | extern void check_panic_on_oom(struct oom_control *oc, |
| 89 | enum oom_constraint constraint, | 92 | enum oom_constraint constraint); |
| 90 | struct mem_cgroup *memcg); | ||
| 91 | 93 | ||
| 92 | extern enum oom_scan_t oom_scan_process_thread(struct oom_control *oc, | 94 | extern enum oom_scan_t oom_scan_process_thread(struct oom_control *oc, |
| 93 | struct task_struct *task, unsigned long totalpages); | 95 | struct task_struct *task); |
| 94 | 96 | ||
| 95 | extern bool out_of_memory(struct oom_control *oc); | 97 | extern bool out_of_memory(struct oom_control *oc); |
| 96 | 98 | ||
