diff options
| author | Adam Litke <agl@us.ibm.com> | 2007-08-22 14:01:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 19:52:46 -0700 |
| commit | a89182c76e54134081cfec6409df06731c5cb98f (patch) | |
| tree | 270616c2f6a1ce63a0bbd196a00e267b27e08250 /mm | |
| parent | d4c63b7c74507c424afcc9c80ba77a55bfb0d07e (diff) | |
| download | linux-3.10-a89182c76e54134081cfec6409df06731c5cb98f.tar.gz linux-3.10-a89182c76e54134081cfec6409df06731c5cb98f.tar.bz2 linux-3.10-a89182c76e54134081cfec6409df06731c5cb98f.zip | |
Fix VM_FAULT flags conversion for hugetlb
It seems a simple mistake was made when converting follow_hugetlb_page()
over to the VM_FAULT flags bitmasks (in "mm: fault feedback #2", commit
83c54070ee1a2d05c89793884bea1a03f2851ed4).
By using the wrong bitmask, hugetlb_fault() failures are not being
recognized. This results in an infinite loop whenever follow_hugetlb_page
is involved in a failed fault.
Signed-off-by: Adam Litke <agl@us.ibm.com>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/hugetlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index d7ca59d66c5..de4cf458d6e 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -643,7 +643,7 @@ int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, spin_unlock(&mm->page_table_lock); ret = hugetlb_fault(mm, vma, vaddr, 0); spin_lock(&mm->page_table_lock); - if (!(ret & VM_FAULT_MAJOR)) + if (!(ret & VM_FAULT_ERROR)) continue; remainder = 0; |