1 files changed, 11 insertions, 12 deletions

diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
index 4b2495285d94..ae2d2c593b2b 100644
--- a/arch/avr32/mm/fault.c
+++ b/arch/avr32/mm/fault.c
@@ -64,6 +64,7 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
         int writeaccess;
         long signr;
         int code;
+        int fault;
 
         if (notify_page_fault(regs, ecr))
                 return;
@@ -132,20 +133,18 @@ good_area:
          * 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:
-                goto out_of_memory;
-        default:
+        fault = handle_mm_fault(mm, vma, address, writeaccess);
+        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)
+                tsk->maj_flt++;
+        else
+                tsk->min_flt++;
 
         up_read(&mm->mmap_sem);
         return;