diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-04 02:22:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-04 02:22:21 -0700 |
| commit | a29889a5369d2604c2053bcd051519a2445d8a70 (patch) | |
| tree | b17e8258894d079b4168994d9438ba7d6e7d1523 /arch/sparc/mm/fault_64.c | |
| parent | e7a088f935180b90cfe6ab0aaae8a556f46885fe (diff) | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
| download | kernel_samsung_tuna-a29889a5369d2604c2053bcd051519a2445d8a70.zip kernel_samsung_tuna-a29889a5369d2604c2053bcd051519a2445d8a70.tar.gz kernel_samsung_tuna-a29889a5369d2604c2053bcd051519a2445d8a70.tar.bz2 | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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: |