diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-08 16:27:31 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-08 16:27:31 +0900 |
| commit | e7a963ef20cabde53d0e609737764ddc65f4605a (patch) | |
| tree | d2bf292f2dde9c6ee213d401abbbdc63fb3afa75 /arch/sparc/mm/fault_64.c | |
| parent | a2494b9b5fb702becaf8d8e3138f7a1a0d3c537e (diff) | |
| parent | 3ff323f89075624b6891e7c428edb8e8a35be13c (diff) | |
| download | kernel_samsung_aries-e7a963ef20cabde53d0e609737764ddc65f4605a.zip kernel_samsung_aries-e7a963ef20cabde53d0e609737764ddc65f4605a.tar.gz kernel_samsung_aries-e7a963ef20cabde53d0e609737764ddc65f4605a.tar.bz2 | |
Merge branches 'sh/smp' and 'sh/stable-updates'
Diffstat (limited to 'arch/sparc/mm/fault_64.c')
| -rw-r--r-- | arch/sparc/mm/fault_64.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c index e5620b2..43b0da9 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: |