1 files changed, 11 insertions, 12 deletions

diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 0b3eaf6fbb28..964c6767dc73 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -33,6 +33,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         struct mm_struct *mm;
         struct vm_area_struct * vma;
         int si_code;
+        int fault;
         siginfo_t info;
 
         trace_hardirqs_on();
@@ -124,20 +125,18 @@ good_area:
          * the fault.
          */
 survive:
-        switch (handle_mm_fault(mm, vma, address, writeaccess)) {
-                case VM_FAULT_MINOR:
-                        tsk->min_flt++;
-                        break;
-                case VM_FAULT_MAJOR:
-                        tsk->maj_flt++;
-                        break;
-                case VM_FAULT_SIGBUS:
-                        goto do_sigbus;
-                case VM_FAULT_OOM:
+        fault = handle_mm_fault(mm, vma, address, writeaccess);
+        if (unlikely(fault & VM_FAULT_ERROR)) {
+                if (fault & VM_FAULT_OOM)
                         goto out_of_memory;
-                default:
-                        BUG();
+                else if (fault & VM_FAULT_SIGBUS)
+                        goto do_sigbus;
+                BUG();
         }
+        if (fault & VM_FAULT_MAJOR)
+                tsk->maj_flt++;
+        else
+                tsk->min_flt++;
 
         up_read(&mm->mmap_sem);
         return;