aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2007-10-17 02:25:53 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:45 -0400
commit70e24bdf6d2fead14631e72a07fba012400c521e (patch)
tree2c00056dfdf90f733876c717159bb8bbf9f440fe /mm
parent5a3135c2e77fe88cdea20b5e3f4761068b799ac2 (diff)
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.c12
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)
164} 164}
165 165
166/* 166/*
167 * Types of limitations to the nodes from which allocations may occur
168 */
169#define CONSTRAINT_NONE 1
170#define CONSTRAINT_MEMORY_POLICY 2
171#define CONSTRAINT_CPUSET 3
172
173/*
174 * Determine the type of allocation constraint. 167 * Determine the type of allocation constraint.
175 */ 168 */
176static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask) 169static inline enum oom_constraint constrained_alloc(struct zonelist *zonelist,
170 gfp_t gfp_mask)
177{ 171{
178#ifdef CONFIG_NUMA 172#ifdef CONFIG_NUMA
179 struct zone **z; 173 struct zone **z;
@@ -393,7 +387,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
393 struct task_struct *p; 387 struct task_struct *p;
394 unsigned long points = 0; 388 unsigned long points = 0;
395 unsigned long freed = 0; 389 unsigned long freed = 0;
396 int constraint; 390 enum oom_constraint constraint;
397 391
398 blocking_notifier_call_chain(&oom_notify_list, 0, &freed); 392 blocking_notifier_call_chain(&oom_notify_list, 0, &freed);
399 if (freed > 0) 393 if (freed > 0)