lib: percpu_counter_add

[powerpc.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index a35e7a8..41b4e36 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -17,6 +17,7 @@
 
 #include <linux/oom.h>
 #include <linux/mm.h>
+#include <linux/err.h>
 #include <linux/sched.h>
 #include <linux/swap.h>
 #include <linux/timex.h>
@@ -156,7 +157,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
        }
 
 #ifdef DEBUG
-       printk(KERN_DEBUG "OOMkill: task %d (%s) got %d points\n",
+       printk(KERN_DEBUG "OOMkill: task %d (%s) got %lu points\n",
        p->pid, p->comm, points);
 #endif
        return points;
@@ -176,14 +177,7 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask)
 {
 #ifdef CONFIG_NUMA
        struct zone **z;
-       nodemask_t nodes;
-       int node;
-
-       nodes_clear(nodes);
-       /* node has memory ? */
-       for_each_online_node(node)
-               if (NODE_DATA(node)->node_present_pages)
-                       node_set(node, nodes);
+       nodemask_t nodes = node_states[N_HIGH_MEMORY];
 
        for (z = zonelist->zones; *z; z++)
                if (cpuset_zone_allowed_softwall(*z, gfp_mask))
@@ -399,6 +393,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;
 
        blocking_notifier_call_chain(&oom_notify_list, 0, &freed);
        if (freed > 0)
@@ -413,14 +408,18 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
                show_mem();
        }
 
-       cpuset_lock();
-       read_lock(&tasklist_lock);
+       if (sysctl_panic_on_oom == 2)
+               panic("out of memory. Compulsory panic_on_oom is selected.\n");
 
        /*
         * Check if there were limitations on the allocation (only relevant for
         * NUMA) that may require different handling.
         */
-       switch (constrained_alloc(zonelist, gfp_mask)) {
+       constraint = constrained_alloc(zonelist, gfp_mask);
+       cpuset_lock();
+       read_lock(&tasklist_lock);
+
+       switch (constraint) {
        case CONSTRAINT_MEMORY_POLICY:
                oom_kill_process(current, points,
                                "No available memory (MPOL_BIND)");