diff --git a/[refs] b/[refs] index 461796a9eab8..c9f3d7f7e48c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2aa15890f3c191326678f1bd68af61ec6b8753ec +refs/heads/master: a3e8cc643d22d2c8ed36b9be7d9c9ca21efcf7f7 diff --git a/trunk/mm/mremap.c b/trunk/mm/mremap.c index 9925b6391b80..1de98d492ddc 100644 --- a/trunk/mm/mremap.c +++ b/trunk/mm/mremap.c @@ -94,9 +94,7 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd, */ mapping = vma->vm_file->f_mapping; spin_lock(&mapping->i_mmap_lock); - if (new_vma->vm_truncate_count && - new_vma->vm_truncate_count != vma->vm_truncate_count) - new_vma->vm_truncate_count = 0; + new_vma->vm_truncate_count = 0; } /*