From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kirill A. Shutemov" Subject: [PATCH 32/34] xtensa: handle pgtable_page_ctor() fail Date: Thu, 10 Oct 2013 21:05:57 +0300 Message-ID: <1381428359-14843-33-git-send-email-kirill.shutemov@linux.intel.com> References: <1381428359-14843-1-git-send-email-kirill.shutemov@linux.intel.com> Return-path: In-Reply-To: <1381428359-14843-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: Andrew Morton , Peter Zijlstra , Ingo Molnar Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, "Kirill A. Shutemov" , Chris Zankel , Max Filippov List-Id: linux-arch.vger.kernel.org Signed-off-by: Kirill A. Shutemov Cc: Chris Zankel Cc: Max Filippov --- arch/xtensa/include/asm/pgalloc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/include/asm/pgalloc.h b/arch/xtensa/include/asm/pgalloc.h index 037671a655..b8774f1e21 100644 --- a/arch/xtensa/include/asm/pgalloc.h +++ b/arch/xtensa/include/asm/pgalloc.h @@ -58,7 +58,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, if (!pte) return NULL; page = virt_to_page(pte); - pgtable_page_ctor(page); + if (!pgtable_page_ctor(page)) { + kmem_cache_free(pgtable_cache, pte); + return NULL; + } return page; } -- 1.8.4.rc3 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([143.182.124.37]:3703 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756613Ab3JJSGP (ORCPT ); Thu, 10 Oct 2013 14:06:15 -0400 From: "Kirill A. Shutemov" Subject: [PATCH 32/34] xtensa: handle pgtable_page_ctor() fail Date: Thu, 10 Oct 2013 21:05:57 +0300 Message-ID: <1381428359-14843-33-git-send-email-kirill.shutemov@linux.intel.com> In-Reply-To: <1381428359-14843-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1381428359-14843-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Andrew Morton , Peter Zijlstra , Ingo Molnar Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, "Kirill A. Shutemov" , Chris Zankel , Max Filippov Message-ID: <20131010180557.gz71NNAN7qL7VVE7VRyff0Duo5E5XplYNE_8ruOsorM@z> Signed-off-by: Kirill A. Shutemov Cc: Chris Zankel Cc: Max Filippov --- arch/xtensa/include/asm/pgalloc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/include/asm/pgalloc.h b/arch/xtensa/include/asm/pgalloc.h index 037671a655..b8774f1e21 100644 --- a/arch/xtensa/include/asm/pgalloc.h +++ b/arch/xtensa/include/asm/pgalloc.h @@ -58,7 +58,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, if (!pte) return NULL; page = virt_to_page(pte); - pgtable_page_ctor(page); + if (!pgtable_page_ctor(page)) { + kmem_cache_free(pgtable_cache, pte); + return NULL; + } return page; } -- 1.8.4.rc3