X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=mm%2Foom_kill.c;h=63ced708eafd1686feaae600fc5a13f7adb3b7c9;hb=f48d97f340cbb0c323fa7a7b36bd76a108a9f49f;hp=dc490c06941b2a6be5170c0d9ca73418b7fe8619;hpb=7ff60f58e244a4f74589f5c5af1a1f5d4db227c3;p=cascardo%2Flinux.git

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index dc490c06941b..63ced708eafd 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -287,9 +287,6 @@ enum oom_scan_t oom_scan_process_thread(struct oom_control *oc,
 	if (oom_task_origin(task))
 		return OOM_SCAN_SELECT;
 
-	if (task_will_free_mem(task) && !is_sysrq_oom(oc))
-		return OOM_SCAN_ABORT;
-
 	return OOM_SCAN_OK;
 }
 
@@ -386,10 +383,11 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask)
 static void dump_header(struct oom_control *oc, struct task_struct *p,
 			struct mem_cgroup *memcg)
 {
-	pr_warning("%s invoked oom-killer: gfp_mask=0x%x, order=%d, "
-		"oom_score_adj=%hd\n",
-		current->comm, oc->gfp_mask, oc->order,
+	pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), order=%d, "
+			"oom_score_adj=%hd\n",
+		current->comm, oc->gfp_mask, &oc->gfp_mask, oc->order,
 		current->signal->oom_score_adj);
+
 	cpuset_print_current_mems_allowed();
 	dump_stack();
 	if (memcg)