diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-02 19:17:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-02 19:17:15 -0700 |
| commit | a923c28fc538a4161b15e9b5d7d48248d73d3e6f (patch) | |
| tree | 93c56ef8e84c2210b6fe568568556700b96a620a /arch | |
| parent | 9a926d86b29a25456f1dd8c9df938e151b1c3978 (diff) | |
| download | blackbird-op-linux-a923c28fc538a4161b15e9b5d7d48248d73d3e6f.tar.gz blackbird-op-linux-a923c28fc538a4161b15e9b5d7d48248d73d3e6f.zip | |
sparc: Use page_fault_out_of_memory() for VM_FAULT_OOM.
As noted by Nick Piggin.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/mm/fault_32.c | 7 | ||||
| -rw-r--r-- | arch/sparc/mm/fault_64.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index a5e30c642ee3..b99f81c4906f 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -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: diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index e5620b27c8bf..43b0da96a4fb 100644 --- a/arch/sparc/mm/fault_64.c +++ b/arch/sparc/mm/fault_64.c @@ -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: |
