Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 65bfe84b6d67..0b6c4db44e08 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -238,9 +238,9 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         up_read(&mm->mmap_sem);
 
         /*
-         * Handle the "normal" case first
+         * Handle the "normal" case first - VM_FAULT_MAJOR / VM_FAULT_MINOR
          */
-        if (fault > 0)
+        if (fault >= VM_FAULT_MINOR)
                 return 0;
 
         /*
@@ -261,7 +261,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
                 do_exit(SIGKILL);
                 return 0;
 
-        case 0:
+        case VM_FAULT_SIGBUS:
                 /*
                  * We had some memory, but were unable to
                  * successfully fix up this page fault.