X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=mm%2Fmemcontrol.c;h=485c688a7fa8a1e17ff7c08d49e65b9604db281a;hb=cbedbac3e66121ddbac363776c23119f8eaeefda;hp=cf428d7b9a03a041516e613563d5d051dfc4c610;hpb=0b9210c9c86e46a7a62bbc7b69b84001315072ff;p=linux-2.6-microblaze.git

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index cf428d7b9a03..485c688a7fa8 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1108,6 +1108,8 @@ static unsigned long mem_cgroup_margin(struct mem_cgroup *memcg)
 		limit = READ_ONCE(memcg->memsw.limit);
 		if (count <= limit)
 			margin = min(margin, limit - count);
+		else
+			margin = 0;
 	}
 
 	return margin;
@@ -1302,6 +1304,8 @@ static bool mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
 				mem_cgroup_iter_break(memcg, iter);
 				if (chosen)
 					put_task_struct(chosen);
+				/* Set a dummy value to return "true". */
+				chosen = (void *) 1;
 				goto unlock;
 			case OOM_SCAN_OK:
 				break;