1 files changed, 11 insertions, 13 deletions

diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c
index b582024d2199..17123e9ecf78 100644
--- a/arch/sparc64/mm/fault.c
+++ b/arch/sparc64/mm/fault.c
@@ -278,7 +278,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma;
         unsigned int insn = 0;
-        int si_code, fault_code;
+        int si_code, fault_code, fault;
         unsigned long address, mm_rss;
 
         fault_code = get_thread_fault_code();
@@ -415,20 +415,18 @@ good_area:
                         goto bad_area;
         }
 
-        switch (handle_mm_fault(mm, vma, address, (fault_code & FAULT_CODE_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:
+        fault = handle_mm_fault(mm, vma, address, (fault_code & FAULT_CODE_WRITE));
+        if (unlikely(fault & VM_FAULT_ERROR)) {
+                if (fault & VM_FAULT_OOM)
+                        goto out_of_memory;
+                else if (fault & VM_FAULT_SIGBUS)
+                        goto do_sigbus;
                 BUG();
         }
+        if (fault & VM_FAULT_MAJOR)
+                current->maj_flt++;
+        else
+                current->min_flt++;
 
         up_read(&mm->mmap_sem);