diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/mempolicy.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 8b57173c1dd5..b1f70d6eec35 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -636,7 +636,6 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, | |||
636 | struct vm_area_struct *prev; | 636 | struct vm_area_struct *prev; |
637 | struct vm_area_struct *vma; | 637 | struct vm_area_struct *vma; |
638 | int err = 0; | 638 | int err = 0; |
639 | pgoff_t pgoff; | ||
640 | unsigned long vmstart; | 639 | unsigned long vmstart; |
641 | unsigned long vmend; | 640 | unsigned long vmend; |
642 | 641 | ||
@@ -649,9 +648,9 @@ static int mbind_range(struct mm_struct *mm, unsigned long start, | |||
649 | vmstart = max(start, vma->vm_start); | 648 | vmstart = max(start, vma->vm_start); |
650 | vmend = min(end, vma->vm_end); | 649 | vmend = min(end, vma->vm_end); |
651 | 650 | ||
652 | pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT); | ||
653 | prev = vma_merge(mm, prev, vmstart, vmend, vma->vm_flags, | 651 | prev = vma_merge(mm, prev, vmstart, vmend, vma->vm_flags, |
654 | vma->anon_vma, vma->vm_file, pgoff, new_pol); | 652 | vma->anon_vma, vma->vm_file, vma->vm_pgoff, |
653 | new_pol); | ||
655 | if (prev) { | 654 | if (prev) { |
656 | vma = prev; | 655 | vma = prev; |
657 | next = vma->vm_next; | 656 | next = vma->vm_next; |