summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2013-11-14 14:31:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 09:32:17 +0900
commit7251ab6b86179f195b3f4b56d57ce9dc7a725409 (patch)
tree6673349e9bf48e6396b2c1510bc26e5802142349
parentca973d86d4c5b70c32e7b91ce08f3e8e061e2535 (diff)
downloadtalos-obmc-linux-7251ab6b86179f195b3f4b56d57ce9dc7a725409.tar.gz
talos-obmc-linux-7251ab6b86179f195b3f4b56d57ce9dc7a725409.zip
m32r: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/m32r/include/asm/pgalloc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/pgalloc.h b/arch/m32r/include/asm/pgalloc.h
index ac4208bcc5ad..2d55a064ccac 100644
--- a/arch/m32r/include/asm/pgalloc.h
+++ b/arch/m32r/include/asm/pgalloc.h
@@ -45,7 +45,10 @@ static __inline__ pgtable_t pte_alloc_one(struct mm_struct *mm,
if (!pte)
return NULL;
- pgtable_page_ctor(pte);
+ if (!pgtable_page_ctor(pte)) {
+ __free_page(pte);
+ return NULL;
+ }
return pte;
}
OpenPOWER on IntegriCloud