summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2013-11-14 23:31:48 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 01:32:19 +0100
commit8f43123d170ad9a6760e424af5bde7569fdd8c12 (patch)
treed55e6f3c2911d3b6f9b1b8afce3204aae511e88f
parentx86: handle pgtable_page_ctor() fail (diff)
downloadlinux-8f43123d170ad9a6760e424af5bde7569fdd8c12.tar.xz
linux-8f43123d170ad9a6760e424af5bde7569fdd8c12.zip
xtensa: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Chris Zankel <chris@zankel.net> Cc: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/xtensa/include/asm/pgalloc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/pgalloc.h b/arch/xtensa/include/asm/pgalloc.h
index 037671a655dc..b8774f1e21e6 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;
}