|
@@ -1282,10 +1282,10 @@ static inline unsigned long zap_pud_range(struct mmu_gather *tlb,
|
|
return addr;
|
|
return addr;
|
|
}
|
|
}
|
|
|
|
|
|
-static unsigned long unmap_page_range(struct mmu_gather *tlb,
|
|
|
|
- struct vm_area_struct *vma,
|
|
|
|
- unsigned long addr, unsigned long end,
|
|
|
|
- struct zap_details *details)
|
|
|
|
|
|
+static void unmap_page_range(struct mmu_gather *tlb,
|
|
|
|
+ struct vm_area_struct *vma,
|
|
|
|
+ unsigned long addr, unsigned long end,
|
|
|
|
+ struct zap_details *details)
|
|
{
|
|
{
|
|
pgd_t *pgd;
|
|
pgd_t *pgd;
|
|
unsigned long next;
|
|
unsigned long next;
|
|
@@ -1305,8 +1305,6 @@ static unsigned long unmap_page_range(struct mmu_gather *tlb,
|
|
} while (pgd++, addr = next, addr != end);
|
|
} while (pgd++, addr = next, addr != end);
|
|
tlb_end_vma(tlb, vma);
|
|
tlb_end_vma(tlb, vma);
|
|
mem_cgroup_uncharge_end();
|
|
mem_cgroup_uncharge_end();
|
|
-
|
|
|
|
- return addr;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1371,10 +1369,9 @@ unsigned long unmap_vmas(struct mmu_gather *tlb,
|
|
*/
|
|
*/
|
|
if (vma->vm_file)
|
|
if (vma->vm_file)
|
|
unmap_hugepage_range(vma, start, end, NULL);
|
|
unmap_hugepage_range(vma, start, end, NULL);
|
|
-
|
|
|
|
- start = end;
|
|
|
|
} else
|
|
} else
|
|
- start = unmap_page_range(tlb, vma, start, end, details);
|
|
|
|
|
|
+ unmap_page_range(tlb, vma, start, end, details);
|
|
|
|
+ start = end;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|