git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index
989af55
..
25a9433
100644
(file)
--- a/
mm/mremap.c
+++ b/
mm/mremap.c
@@
-98,7
+98,7
@@
static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
new_pte = pte_offset_map_nested(new_pmd, new_addr);
new_ptl = pte_lockptr(mm, new_pmd);
if (new_ptl != old_ptl)
new_pte = pte_offset_map_nested(new_pmd, new_addr);
new_ptl = pte_lockptr(mm, new_pmd);
if (new_ptl != old_ptl)
- spin_lock
_nested(new_ptl, SINGLE_DEPTH_NESTING
);
+ spin_lock
(new_ptl
);
for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE,
new_pte++, new_addr += PAGE_SIZE) {
for (; old_addr < old_end; old_pte++, old_addr += PAGE_SIZE,
new_pte++, new_addr += PAGE_SIZE) {
@@
-391,8
+391,8
@@
unsigned long do_mremap(unsigned long addr,
if (vma->vm_flags & VM_MAYSHARE)
map_flags |= MAP_SHARED;
if (vma->vm_flags & VM_MAYSHARE)
map_flags |= MAP_SHARED;
- new_addr = get_unmapped_area
_prot
(vma->vm_file, 0, new_len,
-
vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC
);
+ new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
+
vma->vm_pgoff, map_flags
);
ret = new_addr;
if (new_addr & ~PAGE_MASK)
goto out;
ret = new_addr;
if (new_addr & ~PAGE_MASK)
goto out;