X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=mm%2Fswap_cgroup.c;h=09f733b0424af89d665b59c8b63973aaf48e9032;hb=fd97ed8c874dc479d868ad33311ad227ff0c98ee;hp=b5f7f24b8dd15aca941cf7896f806a3dbe16584f;hpb=03c751a5e10caafbb6d1afcaf1ea67f2153c3193;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
index b5f7f24b8dd1..09f733b0424a 100644
--- a/mm/swap_cgroup.c
+++ b/mm/swap_cgroup.c
@@ -48,6 +48,9 @@ static int swap_cgroup_prepare(int type)
 		if (!page)
 			goto not_enough_page;
 		ctrl->map[idx] = page;
+
+		if (!(idx % SWAP_CLUSTER_MAX))
+			cond_resched();
 	}
 	return 0;
 not_enough_page:
@@ -202,6 +205,8 @@ void swap_cgroup_swapoff(int type)
 			struct page *page = map[i];
 			if (page)
 				__free_page(page);
+			if (!(i % SWAP_CLUSTER_MAX))
+				cond_resched();
 		}
 		vfree(map);
 	}