Commit:     a89182c76e54134081cfec6409df06731c5cb98f
Parent:     d4c63b7c74507c424afcc9c80ba77a55bfb0d07e
Author:     Adam Litke <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 14:01:51 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Aug 22 19:52:46 2007 -0700

    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
    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 <[EMAIL PROTECTED]>
    Acked-by: Nick Piggin <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 mm/hugetlb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index d7ca59d..de4cf45 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,
                        ret = hugetlb_fault(mm, vma, vaddr, 0);
-                       if (!(ret & VM_FAULT_MAJOR))
+                       if (!(ret & VM_FAULT_ERROR))
                        remainder = 0;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to