diff options
Diffstat (limited to 'arch/m32r')
-rw-r--r-- | arch/m32r/mm/fault.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index 28ee389e5f5a..b8ec002aef8e 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c | |||
@@ -188,7 +188,6 @@ good_area: | |||
188 | if ((error_code & ACE_INSTRUCTION) && !(vma->vm_flags & VM_EXEC)) | 188 | if ((error_code & ACE_INSTRUCTION) && !(vma->vm_flags & VM_EXEC)) |
189 | goto bad_area; | 189 | goto bad_area; |
190 | 190 | ||
191 | survive: | ||
192 | /* | 191 | /* |
193 | * If for any reason at all we couldn't handle the fault, | 192 | * If for any reason at all we couldn't handle the fault, |
194 | * make sure we exit gracefully rather than endlessly redo | 193 | * make sure we exit gracefully rather than endlessly redo |
@@ -271,15 +270,10 @@ no_context: | |||
271 | */ | 270 | */ |
272 | out_of_memory: | 271 | out_of_memory: |
273 | up_read(&mm->mmap_sem); | 272 | up_read(&mm->mmap_sem); |
274 | if (is_global_init(tsk)) { | 273 | if (!(error_code & ACE_USERMODE)) |
275 | yield(); | 274 | goto no_context; |
276 | down_read(&mm->mmap_sem); | 275 | pagefault_out_of_memory(); |
277 | goto survive; | 276 | return; |
278 | } | ||
279 | printk("VM: killing process %s\n", tsk->comm); | ||
280 | if (error_code & ACE_USERMODE) | ||
281 | do_group_exit(SIGKILL); | ||
282 | goto no_context; | ||
283 | 277 | ||
284 | do_sigbus: | 278 | do_sigbus: |
285 | up_read(&mm->mmap_sem); | 279 | up_read(&mm->mmap_sem); |