Merge /spare/repo/linux-2.6/

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index eaa701479f5f..0ad945d4c0a4 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -178,17 +178,17 @@ good_area:
          */
 
         switch (handle_mm_fault(mm, vma, address, (acc_type & VM_WRITE) != 0)) {
-              case 1:
+              case VM_FAULT_MINOR:
                 ++current->min_flt;
                 break;
-              case 2:
+              case VM_FAULT_MAJOR:
                 ++current->maj_flt;
                 break;
-              case 0:
+              case VM_FAULT_SIGBUS:
                 /*
-                 * We ran out of memory, or some other thing happened
-                 * to us that made us unable to handle the page fault
-                 * gracefully.
+                 * We hit a hared mapping outside of the file, or some
+                 * other thing happened to us that made us unable to
+                 * handle the page fault gracefully.
                  */
                 goto bad_area;
               default: