1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 6c8ba25bf6bb..0bb7db41f4fe 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -288,6 +288,13 @@ retry:
                               VM_FAULT_BADACCESS))))
                 return 0;
 
+        /*
+         * If we are in kernel mode at this point, we have no context to
+         * handle this fault with.
+         */
+        if (!user_mode(regs))
+                goto no_context;
+
         if (fault & VM_FAULT_OOM) {
                 /*
                  * We ran out of memory, call the OOM killer, and return to
@@ -298,13 +305,6 @@ retry:
                 return 0;
         }
 
-        /*
-         * If we are in kernel mode at this point, we have no context to
-         * handle this fault with.
-         */
-        if (!user_mode(regs))
-                goto no_context;
-
         if (fault & VM_FAULT_SIGBUS) {
                 /*
                  * We had some memory, but were unable to successfully fix up