1 files changed, 11 insertions, 11 deletions

diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c
index c3483365db4b..50747fe44356 100644
--- a/arch/sparc/mm/fault.c
+++ b/arch/sparc/mm/fault.c
@@ -226,6 +226,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
         unsigned long g2;
         siginfo_t info;
         int from_user = !(regs->psr & PSR_PS);
+        int fault;
 
         if(text_fault)
                 address = regs->pc;
@@ -289,19 +290,18 @@ good_area:
          * make sure we exit gracefully rather than endlessly redo
          * the fault.
          */
-        switch (handle_mm_fault(mm, vma, address, write)) {
-        case VM_FAULT_SIGBUS:
-                goto do_sigbus;
-        case VM_FAULT_OOM:
-                goto out_of_memory;
-        case VM_FAULT_MAJOR:
+        fault = handle_mm_fault(mm, vma, address, 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++;
-                break;
-        case VM_FAULT_MINOR:
-        default:
+        else
                 current->min_flt++;
-                break;
-        }
         up_read(&mm->mmap_sem);
         return;