diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-04-23 02:06:21 +1000 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2010-05-06 11:21:58 +0200 |
| commit | 21e1c93631e027136ea4070e7bca600c4ad4f391 (patch) | |
| tree | a6f7e949bbf4d7b6c9a67a40125293e23e42e1a2 /arch | |
| parent | f3ff8212a24f1935b44a3fcdd81c787428f053a6 (diff) | |
| download | linux-21e1c93631e027136ea4070e7bca600c4ad4f391.tar.gz linux-21e1c93631e027136ea4070e7bca600c4ad4f391.tar.bz2 linux-21e1c93631e027136ea4070e7bca600c4ad4f391.zip | |
microblaze: invoke oom-killer from page fault
As explained in commit 1c0fe6e3bd, we want to call the architecture independent
oom killer when getting an unexplained OOM from handle_mm_fault, rather than
simply killing current.
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: Michal Simek <monstr@monstr.eu>
Cc: linux-arch@vger.kernel.org
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: David Rientjes <rientjes@google.com>
Acked-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/mm/fault.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c index 7af87f4b2c2c..bab922993185 100644 --- a/arch/microblaze/mm/fault.c +++ b/arch/microblaze/mm/fault.c @@ -273,16 +273,11 @@ bad_area_nosemaphore: * us unable to handle the page fault gracefully. */ out_of_memory: - if (current->pid == 1) { - yield(); - down_read(&mm->mmap_sem); - goto survive; - } up_read(&mm->mmap_sem); - printk(KERN_WARNING "VM: killing process %s\n", current->comm); - if (user_mode(regs)) - do_exit(SIGKILL); - bad_page_fault(regs, address, SIGKILL); + if (!user_mode(regs)) + bad_page_fault(regs, address, SIGKILL); + else + pagefault_out_of_memory(); return; do_sigbus: |