X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mm%2Fhugetlb.c;h=06a9bc0a312005d11e844cec3566796939c5f751;hb=f4f753ba00cccb170cdd60ad8d4b9ff561676688;hp=c01cb9fedb18f8495c815d4caa380580734e1c8e;hpb=e9a371100dfdfa4c9f994059d19d98c9b4fd80af;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index c01cb9f..06a9bc0 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1134,6 +1134,7 @@ static void return_unused_surplus_pages(struct hstate *h,
 	while (nr_pages--) {
 		if (!free_pool_huge_page(h, &node_states[N_MEMORY], 1))
 			break;
+		cond_resched_lock(&hugetlb_lock);
 	}
 }
 
@@ -1509,6 +1510,7 @@ static unsigned long set_max_huge_pages(struct hstate *h, unsigned long count,
 	while (min_count < persistent_huge_pages(h)) {
 		if (!free_pool_huge_page(h, nodes_allowed, 0))
 			break;
+		cond_resched_lock(&hugetlb_lock);
 	}
 	while (count < persistent_huge_pages(h)) {
 		if (!adjust_pool_surplus(h, nodes_allowed, 1))