From 44b4454a90b5a02fdef59ac0394cdf821c45a9bd Mon Sep 17 00:00:00 2001 From: "Chen, Kenneth W" Date: Wed, 4 Oct 2006 02:15:24 -0700 Subject: [PATCH] --- yaml --- r: 38342 b: refs/heads/master c: fe1668ae5bf0145014c71797febd9ad5670d5d05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 66e7e015b0f3..0fcaae5c86c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e80ee884ae0e3794ef2b65a18a767d502ad712ee +refs/heads/master: fe1668ae5bf0145014c71797febd9ad5670d5d05 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index 7c7d03dbf73d..1d709ff528e1 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -364,6 +364,8 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, pte_t *ptep; pte_t pte; struct page *page; + struct page *tmp; + LIST_HEAD(page_list); WARN_ON(!is_vm_hugetlb_page(vma)); BUG_ON(start & ~HPAGE_MASK); @@ -384,12 +386,16 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, continue; page = pte_page(pte); - put_page(page); + 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) { + list_del(&page->lru); + put_page(page); + } } static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,