diff options
| author | David Rientjes <rientjes@google.com> | 2007-10-17 08:25:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 17:42:45 +0200 |
| commit | 70e24bdf6d2fead14631e72a07fba012400c521e (patch) | |
| tree | 2c00056dfdf90f733876c717159bb8bbf9f440fe /mm | |
| parent | oom: move prototypes to appropriate header file (diff) | |
| download | linux-70e24bdf6d2fead14631e72a07fba012400c521e.tar.xz linux-70e24bdf6d2fead14631e72a07fba012400c521e.zip | |
oom: move constraints to enum
The OOM killer's CONSTRAINT definitions are really more appropriate in an
enum, so define them in include/linux/oom.h.
Cc: Andrea Arcangeli <andrea@suse.de>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/oom_kill.c | 12 |
1 files changed, 3 insertions, 9 deletions
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) |