From 1ca23973066dfe3db80bd92d8fce6acd812ac9fa Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 2 Aug 2009 19:17:15 -0700 Subject: [PATCH] --- yaml --- r: 157091 b: refs/heads/master c: a923c28fc538a4161b15e9b5d7d48248d73d3e6f h: refs/heads/master i: 157089: c6f3e29e04ecbf1e43c325bf0fd42bb73b35a9ce 157087: 6c12a6778cd061a3c3143a9daae8c204f2a0b8be v: v3 --- [refs] | 2 +- trunk/arch/sparc/mm/fault_32.c | 7 ++++--- trunk/arch/sparc/mm/fault_64.c | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 26e3eddf6dbf..838876b94d8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a926d86b29a25456f1dd8c9df938e151b1c3978 +refs/heads/master: a923c28fc538a4161b15e9b5d7d48248d73d3e6f diff --git a/trunk/arch/sparc/mm/fault_32.c b/trunk/arch/sparc/mm/fault_32.c index a5e30c642ee3..b99f81c4906f 100644 --- a/trunk/arch/sparc/mm/fault_32.c +++ b/trunk/arch/sparc/mm/fault_32.c @@ -319,9 +319,10 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, */ 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/trunk/arch/sparc/mm/fault_64.c b/trunk/arch/sparc/mm/fault_64.c index e5620b27c8bf..43b0da96a4fb 100644 --- a/trunk/arch/sparc/mm/fault_64.c +++ b/trunk/arch/sparc/mm/fault_64.c @@ -447,9 +447,10 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) 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: