diff options
| author | Nick Piggin <npiggin@suse.de> | 2010-04-22 16:06:23 +0000 |
|---|---|---|
| committer | Kyle McMartin <kyle@dreadnought.i.jkkm.org> | 2010-05-30 05:41:30 -0400 |
| commit | 53e30d022769434327a682d65031f129cd5d9c33 (patch) | |
| tree | 51f87690c14bd473284221894da76bed9120a24e | |
| parent | 550f0d922286556c7ea43974bb7921effb5a5278 (diff) | |
| download | linux-3.10-53e30d022769434327a682d65031f129cd5d9c33.tar.gz linux-3.10-53e30d022769434327a682d65031f129cd5d9c33.tar.bz2 linux-3.10-53e30d022769434327a682d65031f129cd5d9c33.zip | |
parisc: 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: linux-parisc@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Signed-off-by: Nick Piggin <npiggin@suse.de>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| -rw-r--r-- | arch/parisc/mm/fault.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index c6afbfc9577..18162ce4261 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -264,8 +264,7 @@ no_context: out_of_memory: up_read(&mm->mmap_sem); - printk(KERN_CRIT "VM: killing process %s\n", current->comm); - if (user_mode(regs)) - do_group_exit(SIGKILL); - goto no_context; + if (!user_mode(regs)) + goto no_context; + pagefault_out_of_memory(); } |