git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IPV4]: UDP header annotations
[pandora-kernel.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index
b535438
..
7c15cf3
100644
(file)
--- a/
mm/mremap.c
+++ b/
mm/mremap.c
@@
-13,6
+13,7
@@
#include <linux/shm.h>
#include <linux/mman.h>
#include <linux/swap.h>
#include <linux/shm.h>
#include <linux/mman.h>
#include <linux/swap.h>
+#include <linux/capability.h>
#include <linux/fs.h>
#include <linux/highmem.h>
#include <linux/security.h>
#include <linux/fs.h>
#include <linux/highmem.h>
#include <linux/security.h>
@@
-96,7
+97,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
(new_ptl
);
+ spin_lock
_nested(new_ptl, SINGLE_DEPTH_NESTING
);
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) {
@@
-323,7
+324,7
@@
unsigned long do_mremap(unsigned long addr,
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
goto out;
/* We can't remap across vm area boundaries */
if (old_len > vma->vm_end - addr)
goto out;
- if (vma->vm_flags &
VM_DONTEXPAND
) {
+ if (vma->vm_flags &
(VM_DONTEXPAND | VM_PFNMAP)
) {
if (new_len > old_len)
goto out;
}
if (new_len > old_len)
goto out;
}