> --- a/mm/ksm.c
> +++ b/mm/ksm.c
> @@ -779,7 +779,8 @@ static struct vm_area_struct *find_mergeable_vma(struct 
> mm_struct *mm,
>       if (ksm_test_exit(mm))
>               return NULL;
>       vma = vma_lookup(mm, addr);
> -     if (!vma || !vma_test(vma, VMA_MERGEABLE_BIT) || 
> !vma_has_anon_rmap(vma))
> +     if (!vma || !vma_test(vma, VMA_MERGEABLE_BIT) ||
> +         !vma_has_anon_rmap(vma))

This change should be dropped form this patch IIUC.

It would have to go into the previous one (that I applied) but it's not actually
required.

Unless I am missing something :)

-- 
Cheers,

David

Reply via email to