2 files changed, 26 insertions, 27 deletions

diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 63181671e3e3..60604b2819b2 100644
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
@@ -20,6 +20,7 @@ static int __handle_fault(struct mm_struct *mm, unsigned long address,
 {
         struct vm_area_struct *vma;
         int ret = -EFAULT;
+        int fault;
 
         if (in_atomic())
                 return ret;
@@ -44,20 +45,18 @@ static int __handle_fault(struct mm_struct *mm, unsigned long address,
         }
 
 survive:
-        switch (handle_mm_fault(mm, vma, address, write_access)) {
-        case VM_FAULT_MINOR:
-                current->min_flt++;
-                break;
-        case VM_FAULT_MAJOR:
-                current->maj_flt++;
-                break;
-        case VM_FAULT_SIGBUS:
-                goto out_sigbus;
-        case VM_FAULT_OOM:
-                goto out_of_memory;
-        default:
+        fault = handle_mm_fault(mm, vma, address, write_access);
+        if (unlikely(fault & VM_FAULT_ERROR)) {
+                if (fault & VM_FAULT_OOM)
+                        goto out_of_memory;
+                else if (fault & VM_FAULT_SIGBUS)
+                        goto out_sigbus;
                 BUG();
         }
+        if (fault & VM_FAULT_MAJOR)
+                current->maj_flt++;
+        else
+                current->min_flt++;
         ret = 0;
 out:
         up_read(&mm->mmap_sem);
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index d855cdbf8fb8..54055194e9af 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -307,6 +307,7 @@ do_exception(struct pt_regs *regs, unsigned long error_code, int write)
         unsigned long address;
         int space;
         int si_code;
+        int fault;
 
         if (notify_page_fault(regs, error_code))
                 return;
@@ -377,23 +378,22 @@ survive:
          * make sure we exit gracefully rather than endlessly redo
          * the fault.
          */
-        switch (handle_mm_fault(mm, vma, address, write)) {
-        case VM_FAULT_MINOR:
-                tsk->min_flt++;
-                break;
-        case VM_FAULT_MAJOR:
-                tsk->maj_flt++;
-                break;
-        case VM_FAULT_SIGBUS:
-                do_sigbus(regs, error_code, address);
-                return;
-        case VM_FAULT_OOM:
-                if (do_out_of_memory(regs, error_code, address))
-                        goto survive;
-                return;
-        default:
+        fault = handle_mm_fault(mm, vma, address, write);
+        if (unlikely(fault & VM_FAULT_ERROR)) {
+                if (fault & VM_FAULT_OOM) {
+                        if (do_out_of_memory(regs, error_code, address))
+                                goto survive;
+                        return;
+                } else if (fault & VM_FAULT_SIGBUS) {
+                        do_sigbus(regs, error_code, address);
+                        return;
+                }
                 BUG();
         }
+        if (fault & VM_FAULT_MAJOR)
+                tsk->maj_flt++;
+        else
+                tsk->min_flt++;
 
         up_read(&mm->mmap_sem);
         /*