diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
| commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
| tree | 32a996a5123726b63c31a1522f230933fb967a32 /fs/hugetlbfs/inode.c | |
| parent | e4e7b89280d1d666e2c09e5ad36cf071796c4c7e (diff) | |
| parent | b4103333d7904310d34de18d85e51e3d74f00a3b (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/hugetlbfs/inode.c')
| -rw-r--r-- | fs/hugetlbfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index f568102da1e8..b35195289945 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c | |||
| @@ -72,8 +72,8 @@ huge_pages_needed(struct address_space *mapping, struct vm_area_struct *vma) | |||
| 72 | unsigned long start = vma->vm_start; | 72 | unsigned long start = vma->vm_start; |
| 73 | unsigned long end = vma->vm_end; | 73 | unsigned long end = vma->vm_end; |
| 74 | unsigned long hugepages = (end - start) >> HPAGE_SHIFT; | 74 | unsigned long hugepages = (end - start) >> HPAGE_SHIFT; |
| 75 | pgoff_t next = vma->vm_pgoff; | 75 | pgoff_t next = vma->vm_pgoff >> (HPAGE_SHIFT - PAGE_SHIFT); |
| 76 | pgoff_t endpg = next + ((end - start) >> PAGE_SHIFT); | 76 | pgoff_t endpg = next + hugepages; |
| 77 | 77 | ||
| 78 | pagevec_init(&pvec, 0); | 78 | pagevec_init(&pvec, 0); |
| 79 | while (next < endpg) { | 79 | while (next < endpg) { |