[Bluetooth]: Don't update disconnect timer for incoming connections

[pandora-kernel.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 0131bae..bada3d0 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -59,6 +59,12 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
                return 0;
        }
 
+       /*
+        * swapoff can easily use up all memory, so kill those first.
+        */
+       if (p->flags & PF_SWAPOFF)
+               return ULONG_MAX;
+
        /*
         * The memory size of the process is the basis for the badness.
         */
@@ -171,8 +177,7 @@ static inline int constrained_alloc(struct zonelist *zonelist, gfp_t gfp_mask)
 
        for (z = zonelist->zones; *z; z++)
                if (cpuset_zone_allowed(*z, gfp_mask))
-                       node_clear((*z)->zone_pgdat->node_id,
-                                       nodes);
+                       node_clear(zone_to_nid(*z), nodes);
                else
                        return CONSTRAINT_CPUSET;
 
@@ -201,11 +206,12 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
                unsigned long points;
                int releasing;
 
+               /* skip kernel threads */
+               if (!p->mm)
+                       continue;
                /* skip the init task with pid == 1 */
                if (p->pid == 1)
                        continue;
-               if (p->oomkilladj == OOM_DISABLE)
-                       continue;
 
                /*
                 * This is in the process of releasing memory so wait for it
@@ -230,8 +236,8 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
                        }
                        return ERR_PTR(-1UL);
                }
-               if (p->flags & PF_SWAPOFF)
-                       return p;
+               if (p->oomkilladj == OOM_DISABLE)
+                       continue;
 
                points = badness(p, uptime.tv_sec);
                if (points > *ppoints || !chosen) {
@@ -243,9 +249,9 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
 }
 
 /**
- * We must be careful though to never send SIGKILL a process with
- * CAP_SYS_RAW_IO set, send SIGTERM instead (but it's unlikely that
- * we select a process with CAP_SYS_RAW_IO set).
+ * Send SIGKILL to the selected  process irrespective of  CAP_SYS_RAW_IO
+ * flag though it's unlikely that  we select a process with CAP_SYS_RAW_IO
+ * set.
  */
 static void __oom_kill_task(struct task_struct *p, const char *message)
 {
@@ -374,8 +380,9 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order)
                return;
 
        if (printk_ratelimit()) {
-               printk("oom-killer: gfp_mask=0x%x, order=%d\n",
-                       gfp_mask, order);
+               printk(KERN_WARNING "%s invoked oom-killer: "
+                       "gfp_mask=0x%x, order=%d, oomkilladj=%d\n",
+                       current->comm, gfp_mask, order, current->oomkilladj);
                dump_stack();
                show_mem();
        }