diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /mm/mremap.c | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'mm/mremap.c')
| -rw-r--r-- | mm/mremap.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mm/mremap.c b/mm/mremap.c index bdbcf4841..e237c9442 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -141,12 +141,7 @@ static inline unsigned long move_vma(struct vm_area_struct * vma, 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(¤t->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(¤t->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) { |