aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mm/fault.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index c97f7940cb95..217bcbfde42e 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -349,6 +349,13 @@ retry:
349 if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS)))) 349 if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
350 return 0; 350 return 0;
351 351
352 /*
353 * If we are in kernel mode at this point, we
354 * have no context to handle this fault with.
355 */
356 if (!user_mode(regs))
357 goto no_context;
358
352 if (fault & VM_FAULT_OOM) { 359 if (fault & VM_FAULT_OOM) {
353 /* 360 /*
354 * We ran out of memory, call the OOM killer, and return to 361 * We ran out of memory, call the OOM killer, and return to
@@ -359,13 +366,6 @@ retry:
359 return 0; 366 return 0;
360 } 367 }
361 368
362 /*
363 * If we are in kernel mode at this point, we
364 * have no context to handle this fault with.
365 */
366 if (!user_mode(regs))
367 goto no_context;
368
369 if (fault & VM_FAULT_SIGBUS) { 369 if (fault & VM_FAULT_SIGBUS) {
370 /* 370 /*
371 * We had some memory, but were unable to 371 * We had some memory, but were unable to