diff options
Diffstat (limited to 'mm/hugetlb.c')
-rw-r--r-- | mm/hugetlb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index aaa7c1a682d9..c4a573b857bd 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
@@ -469,7 +469,7 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, | |||
469 | avoidcopy = (page_count(old_page) == 1); | 469 | avoidcopy = (page_count(old_page) == 1); |
470 | if (avoidcopy) { | 470 | if (avoidcopy) { |
471 | set_huge_ptep_writable(vma, address, ptep); | 471 | set_huge_ptep_writable(vma, address, ptep); |
472 | return VM_FAULT_MINOR; | 472 | return 0; |
473 | } | 473 | } |
474 | 474 | ||
475 | page_cache_get(old_page); | 475 | page_cache_get(old_page); |
@@ -494,7 +494,7 @@ static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, | |||
494 | } | 494 | } |
495 | page_cache_release(new_page); | 495 | page_cache_release(new_page); |
496 | page_cache_release(old_page); | 496 | page_cache_release(old_page); |
497 | return VM_FAULT_MINOR; | 497 | return 0; |
498 | } | 498 | } |
499 | 499 | ||
500 | static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma, | 500 | static int hugetlb_no_page(struct mm_struct *mm, struct vm_area_struct *vma, |
@@ -551,7 +551,7 @@ retry: | |||
551 | if (idx >= size) | 551 | if (idx >= size) |
552 | goto backout; | 552 | goto backout; |
553 | 553 | ||
554 | ret = VM_FAULT_MINOR; | 554 | ret = 0; |
555 | if (!pte_none(*ptep)) | 555 | if (!pte_none(*ptep)) |
556 | goto backout; | 556 | goto backout; |
557 | 557 | ||
@@ -602,7 +602,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, | |||
602 | return ret; | 602 | return ret; |
603 | } | 603 | } |
604 | 604 | ||
605 | ret = VM_FAULT_MINOR; | 605 | ret = 0; |
606 | 606 | ||
607 | spin_lock(&mm->page_table_lock); | 607 | spin_lock(&mm->page_table_lock); |
608 | /* Check for a racing update before calling hugetlb_cow */ | 608 | /* Check for a racing update before calling hugetlb_cow */ |
@@ -641,7 +641,7 @@ int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma, | |||
641 | spin_unlock(&mm->page_table_lock); | 641 | spin_unlock(&mm->page_table_lock); |
642 | ret = hugetlb_fault(mm, vma, vaddr, 0); | 642 | ret = hugetlb_fault(mm, vma, vaddr, 0); |
643 | spin_lock(&mm->page_table_lock); | 643 | spin_lock(&mm->page_table_lock); |
644 | if (ret == VM_FAULT_MINOR) | 644 | if (!(ret & VM_FAULT_MAJOR)) |
645 | continue; | 645 | continue; |
646 | 646 | ||
647 | remainder = 0; | 647 | remainder = 0; |