X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=mm%2Fksm.c;h=5575f8628fef5306611055092e47ed9f472f4027;hb=a5027ccd3c1abe190d2b84a2d7e40d5f099e48a7;hp=bef1af4f77e36186503c9fe2f91530954a456f3f;hpb=ef4b18e2af09b69b5a183ad611f5965ef1766be4;p=cascardo%2Flinux.git diff --git a/mm/ksm.c b/mm/ksm.c index bef1af4f77e3..5575f8628fef 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -1012,6 +1012,7 @@ static struct rmap_item *unstable_tree_search_insert(struct page *page, struct rmap_item *tree_rmap_item; int ret; + cond_resched(); tree_rmap_item = rb_entry(*new, struct rmap_item, node); page2[0] = get_mergeable_page(tree_rmap_item); if (!page2[0])