[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 c5e3840..bada3d0 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -177,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;
 
@@ -250,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)
 {