diff options
Diffstat (limited to 'arch/unicore32/mm')
-rw-r--r-- | arch/unicore32/mm/fault.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c index f9b5c10bccee..8ed3c4509d84 100644 --- a/arch/unicore32/mm/fault.c +++ b/arch/unicore32/mm/fault.c | |||
@@ -278,6 +278,13 @@ retry: | |||
278 | (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS)))) | 278 | (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS)))) |
279 | return 0; | 279 | return 0; |
280 | 280 | ||
281 | /* | ||
282 | * If we are in kernel mode at this point, we | ||
283 | * have no context to handle this fault with. | ||
284 | */ | ||
285 | if (!user_mode(regs)) | ||
286 | goto no_context; | ||
287 | |||
281 | if (fault & VM_FAULT_OOM) { | 288 | if (fault & VM_FAULT_OOM) { |
282 | /* | 289 | /* |
283 | * We ran out of memory, call the OOM killer, and return to | 290 | * We ran out of memory, call the OOM killer, and return to |
@@ -288,13 +295,6 @@ retry: | |||
288 | return 0; | 295 | return 0; |
289 | } | 296 | } |
290 | 297 | ||
291 | /* | ||
292 | * If we are in kernel mode at this point, we | ||
293 | * have no context to handle this fault with. | ||
294 | */ | ||
295 | if (!user_mode(regs)) | ||
296 | goto no_context; | ||
297 | |||
298 | if (fault & VM_FAULT_SIGBUS) { | 298 | if (fault & VM_FAULT_SIGBUS) { |
299 | /* | 299 | /* |
300 | * We had some memory, but were unable to | 300 | * We had some memory, but were unable to |