patch-2.4.0-prerelease linux/mm/mremap.c

• Lines: 14
• Date: Fri Dec 29 14:07:24 2000
• Orig file: v2.4.0-test12/linux/mm/mremap.c
• Orig date: Mon Dec 11 17:59:45 2000

diff -u --recursive --new-file v2.4.0-test12/linux/mm/mremap.c linux/mm/mremap.c
@@ -141,12 +141,7 @@
 				get_file(new_vma->vm_file);
 			if (new_vma->vm_ops && new_vma->vm_ops->open)
 				new_vma->vm_ops->open(new_vma);
-			lock_vma_mappings(vma);
-			spin_lock(&current->mm->page_table_lock);
-			__insert_vm_struct(current->mm, new_vma);
-			unlock_vma_mappings(vma);
-			merge_segments(current->mm, new_vma->vm_start, new_vma->vm_end);
-			spin_unlock(&current->mm->page_table_lock);
+			insert_vm_struct(current->mm, new_vma);
 			do_munmap(current->mm, addr, old_len);
 			current->mm->total_vm += new_len >> PAGE_SHIFT;
 			if (new_vma->vm_flags & VM_LOCKED) {