projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Auto-update from upstream
[linux-2.6-block.git]
/
mm
/
madvise.c
diff --git
a/mm/madvise.c
b/mm/madvise.c
index 20e075d1c64c9c64674e5fc418c6643418931661..2b7cf0400a217cd453641eaf097d1291125e1431 100644
(file)
--- a/
mm/madvise.c
+++ b/
mm/madvise.c
@@
-126,7
+126,7
@@
static long madvise_dontneed(struct vm_area_struct * vma,
unsigned long start, unsigned long end)
{
*prev = vma;
- if (
(vma->vm_flags & VM_LOCKED) || is_vm_hugetlb_page(vma
))
+ if (
vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP
))
return -EINVAL;
if (unlikely(vma->vm_flags & VM_NONLINEAR)) {