diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-08-09 17:19:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-09 20:44:58 -0700 |
| commit | 67a8a20fe1eec43ebfa7f2b83e988dbdb4c16271 (patch) | |
| tree | b5d5023e7d72d9b1f823b5ab35bf0430e0f9ebae /arch/avr32/mm | |
| parent | 596d7cfa2be6284512915609f01b7fe2f4df5d02 (diff) | |
| download | op-kernel-dev-67a8a20fe1eec43ebfa7f2b83e988dbdb4c16271.zip op-kernel-dev-67a8a20fe1eec43ebfa7f2b83e988dbdb4c16271.tar.gz | |
avr32: 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: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/avr32/mm')
| -rw-r--r-- | arch/avr32/mm/fault.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c index b61d86d..f7040a1 100644 --- a/arch/avr32/mm/fault.c +++ b/arch/avr32/mm/fault.c @@ -132,7 +132,6 @@ good_area: * sure we exit gracefully rather than endlessly redo the * fault. */ -survive: fault = handle_mm_fault(mm, vma, address, writeaccess ? FAULT_FLAG_WRITE : 0); if (unlikely(fault & VM_FAULT_ERROR)) { if (fault & VM_FAULT_OOM) @@ -211,15 +210,10 @@ no_context: */ out_of_memory: up_read(&mm->mmap_sem); - if (is_global_init(current)) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } - printk("VM: Killing process %s\n", tsk->comm); - if (user_mode(regs)) - do_group_exit(SIGKILL); - goto no_context; + pagefault_out_of_memory(); + if (!user_mode(regs)) + goto no_context; + return; do_sigbus: up_read(&mm->mmap_sem); |
