From 515a99de3c2a7ec1feb95f28e471fadc30110fd4 Mon Sep 17 00:00:00 2001 From: "Chen, Kenneth W" Date: Wed, 6 Dec 2006 20:32:07 -0800 Subject: [PATCH] --- yaml --- r: 42655 b: refs/heads/master c: cace673d376d97b0c66ffa0a49b8d588a696d5d2 h: refs/heads/master i: 42653: 08ff75a488ed65cf7f1dd2e37fde7d73efc4cb67 42651: 3b7d2e3f74308c3508be6aaa7f462e9b5bbfca35 42647: a3cf06113c75f6cd9303967c1484b9f92718dee9 42639: aa7ba057d3b2e0077bcd1605ce67e854c9cb93a4 42623: ac99c8d8a1914ed0509a3c8131fe652ef793f955 v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3e60870c8477..c84c8a8c1b42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 39dde65c9940c97fcd178a3d2b1c57ed8b7b68aa +refs/heads/master: cace673d376d97b0c66ffa0a49b8d588a696d5d2 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index 9244971b6791..2911a364481e 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -344,7 +344,6 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, entry = *src_pte; ptepage = pte_page(entry); get_page(ptepage); - add_mm_counter(dst, file_rss, HPAGE_SIZE / PAGE_SIZE); set_huge_pte_at(dst, addr, dst_pte, entry); } spin_unlock(&src->page_table_lock); @@ -377,10 +376,6 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, BUG_ON(end & ~HPAGE_MASK); spin_lock(&mm->page_table_lock); - - /* Update high watermark before we lower rss */ - update_hiwater_rss(mm); - for (address = start; address < end; address += HPAGE_SIZE) { ptep = huge_pte_offset(mm, address); if (!ptep) @@ -395,9 +390,7 @@ void __unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, page = pte_page(pte); list_add(&page->lru, &page_list); - add_mm_counter(mm, file_rss, (int) -(HPAGE_SIZE / PAGE_SIZE)); } - spin_unlock(&mm->page_table_lock); flush_tlb_range(vma, start, end); list_for_each_entry_safe(page, tmp, &page_list, lru) { @@ -523,7 +516,6 @@ int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma, if (!pte_none(*ptep)) goto backout; - add_mm_counter(mm, file_rss, HPAGE_SIZE / PAGE_SIZE); new_pte = make_huge_pte(vma, page, ((vma->vm_flags & VM_WRITE) && (vma->vm_flags & VM_SHARED))); set_huge_pte_at(mm, address, ptep, new_pte);