diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-28 17:46:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-28 17:46:32 -0500 |
| commit | a880b11a95fab4618da412d99fc7365d723e702d (patch) | |
| tree | 10839a82741b7154067adfff425dadef3caf4163 /mm/msync.c | |
| parent | 899a1fc084ef3dcb57737d8847bf219cbf353ed3 (diff) | |
| parent | 458af5439fe7ae7d95ca14106844e61f0795166c (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'mm/msync.c')
| -rw-r--r-- | mm/msync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/msync.c b/mm/msync.c index 0e040e9c39d..b3f4caf3010 100644 --- a/mm/msync.c +++ b/mm/msync.c @@ -97,9 +97,9 @@ static void msync_page_range(struct vm_area_struct *vma, /* For hugepages we can't go walking the page table normally, * but that's ok, hugetlbfs is memory based, so we don't need * to do anything more on an msync(). - * Can't do anything with VM_RESERVED regions either. + * Can't do anything with VM_UNPAGED regions either. */ - if (vma->vm_flags & (VM_HUGETLB|VM_RESERVED)) + if (vma->vm_flags & (VM_HUGETLB|VM_UNPAGED)) return; BUG_ON(addr >= end); |