diff options
author | Nick Piggin <npiggin@suse.de> | 2007-07-19 04:47:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 13:04:41 -0400 |
commit | 83c54070ee1a2d05c89793884bea1a03f2851ed4 (patch) | |
tree | dc732f5a9b93fb7004ed23f551bd98b77cc580e0 /mm/hugetlb.c | |
parent | d0217ac04ca6591841e5665f518e38064f4e65bd (diff) |
mm: fault feedback #2
This patch completes Linus's wish that the fault return codes be made into
bit flags, which I agree makes everything nicer. This requires requires
all handle_mm_fault callers to be modified (possibly the modifications
should go further and do things like fault accounting in handle_mm_fault --
however that would be for another patch).
[akpm@linux-foundation.org: fix alpha build]
[akpm@linux-foundation.org: fix s390 build]
[akpm@linux-foundation.org: fix sparc build]
[akpm@linux-foundation.org: fix sparc64 build]
[akpm@linux-foundation.org: fix ia64 build]
Signed-off-by: Nick Piggin <npiggin@suse.de>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ian Molton <spyro@f2s.com>
Cc: Bryan Wu <bryan.wu@analog.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Matthew Wilcox <willy@debian.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Richard Curnow <rc@rc0.org.uk>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: Chris Zankel <chris@zankel.net>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Acked-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[ Still apparently needs some ARM and PPC loving - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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 aaa7c1a682d..c4a573b857b 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; |