projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pci-v5.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
[linux-2.6-microblaze.git]
/
mm
/
mremap.c
diff --git
a/mm/mremap.c
b/mm/mremap.c
index
ec8f840
..
d22629f
100644
(file)
--- a/
mm/mremap.c
+++ b/
mm/mremap.c
@@
-545,7
+545,7
@@
static unsigned long move_vma(struct vm_area_struct *vma,
if (moved_len < old_len) {
err = -ENOMEM;
} else if (vma->vm_ops && vma->vm_ops->mremap) {
if (moved_len < old_len) {
err = -ENOMEM;
} else if (vma->vm_ops && vma->vm_ops->mremap) {
- err = vma->vm_ops->mremap(new_vma
, flags
);
+ err = vma->vm_ops->mremap(new_vma);
}
if (unlikely(err)) {
}
if (unlikely(err)) {
@@
-653,8
+653,8
@@
static struct vm_area_struct *vma_to_resize(unsigned long addr,
return ERR_PTR(-EINVAL);
}
return ERR_PTR(-EINVAL);
}
- if (
flags & MREMAP_DONTUNMAP && (!vma_is_anonymous(vma) ||
-
vma->vm_flags & VM_SHARED
))
+ if (
(flags & MREMAP_DONTUNMAP) &&
+
(vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)
))
return ERR_PTR(-EINVAL);
if (is_vm_hugetlb_page(vma))
return ERR_PTR(-EINVAL);
if (is_vm_hugetlb_page(vma))