aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/mm/memory.c b/mm/memory.c
index a25ee1d3e20a..692ad810263d 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -820,6 +820,7 @@ unsigned long zap_page_range(struct vm_area_struct *vma, unsigned long address,
820 lru_add_drain(); 820 lru_add_drain();
821 spin_lock(&mm->page_table_lock); 821 spin_lock(&mm->page_table_lock);
822 tlb = tlb_gather_mmu(mm, 0); 822 tlb = tlb_gather_mmu(mm, 0);
823 update_hiwater_rss(mm);
823 end = unmap_vmas(&tlb, mm, vma, address, end, &nr_accounted, details); 824 end = unmap_vmas(&tlb, mm, vma, address, end, &nr_accounted, details);
824 tlb_finish_mmu(tlb, address, end); 825 tlb_finish_mmu(tlb, address, end);
825 spin_unlock(&mm->page_table_lock); 826 spin_unlock(&mm->page_table_lock);
@@ -2225,22 +2226,6 @@ unsigned long vmalloc_to_pfn(void * vmalloc_addr)
2225 2226
2226EXPORT_SYMBOL(vmalloc_to_pfn); 2227EXPORT_SYMBOL(vmalloc_to_pfn);
2227 2228
2228/*
2229 * update_mem_hiwater
2230 * - update per process rss and vm high water data
2231 */
2232void update_mem_hiwater(struct task_struct *tsk)
2233{
2234 if (tsk->mm) {
2235 unsigned long rss = get_mm_rss(tsk->mm);
2236
2237 if (tsk->mm->hiwater_rss < rss)
2238 tsk->mm->hiwater_rss = rss;
2239 if (tsk->mm->hiwater_vm < tsk->mm->total_vm)
2240 tsk->mm->hiwater_vm = tsk->mm->total_vm;
2241 }
2242}
2243
2244#if !defined(__HAVE_ARCH_GATE_AREA) 2229#if !defined(__HAVE_ARCH_GATE_AREA)
2245 2230
2246#if defined(AT_SYSINFO_EHDR) 2231#if defined(AT_SYSINFO_EHDR)