From c63fa7b0f4e1bbdaa6c259ac4ec077a5adc73ecd Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Thu, 12 Apr 2012 12:49:15 -0700 Subject: [PATCH] --- yaml --- r: 299066 b: refs/heads/master c: 66aebce747eaf9bc456bf1f1b217d8db843031d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 17646b555096..1f50ac58f650 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3ec434c69ac7f447ff6e6389c19727c9f002087 +refs/heads/master: 66aebce747eaf9bc456bf1f1b217d8db843031d0 diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index b8ce6f450956..cd65cb19c941 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -2791,6 +2791,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * so no worry about deadlock. */ page = pte_page(entry); + get_page(page); if (page != pagecache_page) lock_page(page); @@ -2822,6 +2823,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, } if (page != pagecache_page) unlock_page(page); + put_page(page); out_mutex: mutex_unlock(&hugetlb_instantiation_mutex);