From 07d43ead901b488c9aa36d82b5269b569c5ea277 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 24 Feb 2011 08:39:46 -0800 Subject: [PATCH] --- yaml --- r: 233638 b: refs/heads/master c: dcace5ac85c628af21878a1fa151e5e6403fb8eb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mremap.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cffbad6e0a22..d4befe24c050 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf9faa2aa30e2ebf30287536712ed2717bb47002 +refs/heads/master: dcace5ac85c628af21878a1fa151e5e6403fb8eb 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; } /*