sparc: Use page_fault_out_of_memory() for VM_FAULT_OOM.
authorDavid S. Miller <davem@davemloft.net>
Mon, 3 Aug 2009 02:17:15 +0000 (19:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Aug 2009 02:17:15 +0000 (19:17 -0700)
As noted by Nick Piggin.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/mm/fault_32.c
arch/sparc/mm/fault_64.c

index a5e30c642ee3bf33f136cababbb99bc20a9aba07..b99f81c4906f72ae3486c54d3cc1e69d15822383 100644 (file)
@@ -319,9 +319,10 @@ no_context:
  */
 out_of_memory:
        up_read(&mm->mmap_sem);
-       printk("VM: killing process %s\n", tsk->comm);
-       if (from_user)
-               do_group_exit(SIGKILL);
+       if (from_user) {
+               pagefault_out_of_memory();
+               return;
+       }
        goto no_context;
 
 do_sigbus:
index e5620b27c8bf6a9877367c28ca9088889f259d99..43b0da96a4fb92c4a3f5e3e1eaac67ae611832e5 100644 (file)
@@ -447,9 +447,10 @@ handle_kernel_fault:
 out_of_memory:
        insn = get_fault_insn(regs, insn);
        up_read(&mm->mmap_sem);
-       printk("VM: killing process %s\n", current->comm);
-       if (!(regs->tstate & TSTATE_PRIV))
-               do_group_exit(SIGKILL);
+       if (!(regs->tstate & TSTATE_PRIV)) {
+               pagefault_out_of_memory();
+               return;
+       }
        goto handle_kernel_fault;
 
 intr_or_no_mm: