Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299066
b: refs/heads/master
c: 66aebce
h: refs/heads/master
v: v3
  • Loading branch information
Chris Metcalf authored and Linus Torvalds committed Apr 12, 2012
1 parent 50e9acc commit c63fa7b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f3ec434c69ac7f447ff6e6389c19727c9f002087
refs/heads/master: 66aebce747eaf9bc456bf1f1b217d8db843031d0
2 changes: 2 additions & 0 deletions trunk/mm/hugetlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit c63fa7b

Please sign in to comment.