aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memcontrol.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r--include/linux/memcontrol.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 2de6504e01fb..2fdd1380bf0a 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -102,6 +102,8 @@ static inline bool mem_cgroup_disabled(void)
102 return false; 102 return false;
103} 103}
104 104
105extern bool mem_cgroup_oom_called(struct task_struct *task);
106
105#else /* CONFIG_CGROUP_MEM_RES_CTLR */ 107#else /* CONFIG_CGROUP_MEM_RES_CTLR */
106struct mem_cgroup; 108struct mem_cgroup;
107 109
@@ -234,6 +236,11 @@ static inline bool mem_cgroup_disabled(void)
234{ 236{
235 return true; 237 return true;
236} 238}
239
240static inline bool mem_cgroup_oom_called(struct task_struct *task)
241{
242 return false;
243}
237#endif /* CONFIG_CGROUP_MEM_CONT */ 244#endif /* CONFIG_CGROUP_MEM_CONT */
238 245
239#endif /* _LINUX_MEMCONTROL_H */ 246#endif /* _LINUX_MEMCONTROL_H */