diff options
Diffstat (limited to '')
| -rw-r--r-- | include/linux/oom.h | 9 | ||||
| -rw-r--r-- | mm/oom_kill.c | 12 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/linux/oom.h b/include/linux/oom.h index b40bb4e32c2f..cf6ebf5b422c 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -11,6 +11,15 @@ #ifdef __KERNEL__ +/* + * Types of limitations to the nodes from which allocations may occur + */ +enum oom_constraint { + CONSTRAINT_NONE, + CONSTRAINT_CPUSET, + CONSTRAINT_MEMORY_POLICY, +}; + extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order); extern int register_oom_notifier(struct notifier_block *nb); extern int unregister_oom_notifier(struct notifier_block *nb); diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 41b4e362221d..1a7a4ef04e27 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -164,16 +164,10 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) } /* - * Types of limitations to the nodes from which allocations may occur - */ -#define CONSTRAINT_NONE 1 -#define CONSTRAINT_MEMORY_POLICY 2 -#define CONSTRAINT_CPUSET 3 - -/* * Determine the type of allocation constraint. */ -static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask) +static inline enum oom_constraint constrained_alloc(struct zonelist *zonelist, + gfp_t gfp_mask) { #ifdef CONFIG_NUMA struct zone **z; @@ -393,7 +387,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order) struct task_struct *p; unsigned long points = 0; unsigned long freed = 0; - int constraint; + enum oom_constraint constraint; blocking_notifier_call_chain(&oom_notify_list, 0, &freed); if (freed > 0) |