1 files changed, 11 insertions, 15 deletions

diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 0ece51310bfe..3767211b3d0f 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -145,7 +145,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
         struct mm_struct *mm = current->mm;
         siginfo_t info;
         int code = SEGV_MAPERR;
-        int is_write = 0;
+        int is_write = 0, ret;
         int trap = TRAP(regs);
         int is_exec = trap == 0x400;
 
@@ -330,22 +330,18 @@ good_area:
          * the fault.
          */
  survive:
-        switch (handle_mm_fault(mm, vma, address, is_write)) {
-
-        case VM_FAULT_MINOR:
-                current->min_flt++;
-                break;
-        case VM_FAULT_MAJOR:
-                current->maj_flt++;
-                break;
-        case VM_FAULT_SIGBUS:
-                goto do_sigbus;
-        case VM_FAULT_OOM:
-                goto out_of_memory;
-        default:
+        ret = handle_mm_fault(mm, vma, address, is_write);
+        if (unlikely(ret & VM_FAULT_ERROR)) {
+                if (ret & VM_FAULT_OOM)
+                        goto out_of_memory;
+                else if (ret & VM_FAULT_SIGBUS)
+                        goto do_sigbus;
                 BUG();
         }
-
+        if (ret & VM_FAULT_MAJOR)
+                current->maj_flt++;
+        else
+                current->min_flt++;
         up_read(&mm->mmap_sem);
         return 0;