parisc: invoke oom-killer from page fault
authorNick Piggin <npiggin@suse.de>
Thu, 22 Apr 2010 16:06:23 +0000 (16:06 +0000)
committerKyle McMartin <kyle@dreadnought.i.jkkm.org>
Sun, 30 May 2010 09:41:30 +0000 (05:41 -0400)
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>
arch/parisc/mm/fault.c

index c6afbfc..18162ce 100644 (file)
@@ -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();
 }