From patchwork Thu Apr 22 16:06:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Piggin X-Patchwork-Id: 94162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3MGHtUu027543 for ; Thu, 22 Apr 2010 16:17:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754157Ab0DVQRx (ORCPT ); Thu, 22 Apr 2010 12:17:53 -0400 Received: from cantor.suse.de ([195.135.220.2]:52105 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754109Ab0DVQRw (ORCPT ); Thu, 22 Apr 2010 12:17:52 -0400 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id DA34E945D8; Thu, 22 Apr 2010 18:17:51 +0200 (CEST) Received: by laptop.local0.net (Postfix, from userid 1000) id 0430A29822; Fri, 23 Apr 2010 02:17:26 +1000 (EST) Message-Id: <20100422161224.322033236@suse.de> User-Agent: quilt/0.48-4.4 Date: Fri, 23 Apr 2010 02:06:23 +1000 From: npiggin@suse.de To: linux-arch@vger.kernel.org Cc: David Rientjes , Andrew Morton , linux-parisc@vger.kernel.org, Kyle McMartin Subject: [patch 10/14] parisc: invoke oom-killer from page fault References: <20100422160613.723698029@suse.de> Content-Disposition: inline; filename=parisc-pagefault-use-oom.patch Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 22 Apr 2010 16:17:56 +0000 (UTC) Index: linux-2.6/arch/parisc/mm/fault.c =================================================================== --- linux-2.6.orig/arch/parisc/mm/fault.c +++ linux-2.6/arch/parisc/mm/fault.c @@ -264,8 +264,7 @@ no_context: 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(); }