diff --git a/[refs] b/[refs] index f23e00fe1b7a..f683fda4fce6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 550f0d922286556c7ea43974bb7921effb5a5278 +refs/heads/master: 53e30d022769434327a682d65031f129cd5d9c33 diff --git a/trunk/arch/parisc/mm/fault.c b/trunk/arch/parisc/mm/fault.c index c6afbfc95770..18162ce4261e 100644 --- a/trunk/arch/parisc/mm/fault.c +++ b/trunk/arch/parisc/mm/fault.c @@ -264,8 +264,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, out_of_memory: up_read(&mm->mmap_sem); - printk(KERN_CRIT "VM: killing process %s\n", current->comm); - if (user_mode(regs)) - do_group_exit(SIGKILL); - goto no_context; + if (!user_mode(regs)) + goto no_context; + pagefault_out_of_memory(); }