From 7dff35bb512a51f5c5ab267ce3679c2e013dd579 Mon Sep 17 00:00:00 2001 From: Adam Litke Date: Fri, 6 Jan 2006 00:10:42 -0800 Subject: [PATCH] --- yaml --- r: 16301 b: refs/heads/master c: 85ef47f74afe96c8c23eaa605f28cc01443c905f h: refs/heads/master i: 16299: 1948bcb139230fc18d1dea27a0992fa915cc792f v: v3 --- [refs] | 2 +- trunk/mm/hugetlb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1c8ff00f946f..68daf65412df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0916794f00be44154102dedaeafe68b743078a2 +refs/heads/master: 85ef47f74afe96c8c23eaa605f28cc01443c905f diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c index acb864130f80..fdbbbb90caa2 100644 --- a/trunk/mm/hugetlb.c +++ b/trunk/mm/hugetlb.c @@ -345,8 +345,8 @@ void unmap_hugepage_range(struct vm_area_struct *vma, unsigned long start, flush_tlb_range(vma, start, end); } -static struct page *find_lock_huge_page(struct address_space *mapping, - unsigned long idx) +static struct page *find_or_alloc_huge_page(struct address_space *mapping, + unsigned long idx) { struct page *page; int err; @@ -398,7 +398,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * Use page lock to guard against racing truncation * before we get page_table_lock. */ - page = find_lock_huge_page(mapping, idx); + page = find_or_alloc_huge_page(mapping, idx); if (!page) goto out;