diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-06-04 17:14:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:21:44 -0400 |
| commit | c421b08ef52f38049c6f591c5d260a97af7b0000 (patch) | |
| tree | cc5e18ca6f960fced5cc588311d33afdcd999806 | |
| parent | 68db30ce609a8fc21b95f38f509c65dab0ecfa96 (diff) | |
mn10300: invoke oom-killer from page fault
As explained in commit 1c0fe6e3bd ("mm: invoke oom-killer from page
fault") , we want to call the architecture independent oom killer when
getting an unexplained OOM from handle_mm_fault, rather than simply
killing current.
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/mn10300/mm/fault.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c index 53bb17d0f068..81f153fa51b4 100644 --- a/arch/mn10300/mm/fault.c +++ b/arch/mn10300/mm/fault.c | |||
| @@ -338,11 +338,10 @@ no_context: | |||
| 338 | */ | 338 | */ |
| 339 | out_of_memory: | 339 | out_of_memory: |
| 340 | up_read(&mm->mmap_sem); | 340 | up_read(&mm->mmap_sem); |
| 341 | monitor_signal(regs); | 341 | if ((fault_code & MMUFCR_xFC_ACCESS) != MMUFCR_xFC_ACCESS_USR) |
| 342 | printk(KERN_ALERT "VM: killing process %s\n", tsk->comm); | 342 | goto no_context; |
| 343 | if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR) | 343 | pagefault_out_of_memory(); |
| 344 | do_exit(SIGKILL); | 344 | return; |
| 345 | goto no_context; | ||
| 346 | 345 | ||
| 347 | do_sigbus: | 346 | do_sigbus: |
| 348 | up_read(&mm->mmap_sem); | 347 | up_read(&mm->mmap_sem); |
