summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>2013-11-14 14:31:40 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-15 09:32:18 +0900
commit96da3a62ea1fef2d9dfa8eff97706603918d5f4d (patch)
treea3d9ba07d6df133fe65f708efdb7d33b5b059960 /arch
parente89cfa58a8358fdb4d4e79936c25222416ad415e (diff)
downloadlinux-96da3a62ea1fef2d9dfa8eff97706603918d5f4d.tar.gz
linux-96da3a62ea1fef2d9dfa8eff97706603918d5f4d.tar.bz2
linux-96da3a62ea1fef2d9dfa8eff97706603918d5f4d.zip
score: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Chen Liqin <liqin.chen@sunplusct.com> Acked-by: Lennox Wu <lennox.wu@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/score/include/asm/pgalloc.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/score/include/asm/pgalloc.h b/arch/score/include/asm/pgalloc.h
index 716b3fd1d863..2e067657db98 100644
--- a/arch/score/include/asm/pgalloc.h
+++ b/arch/score/include/asm/pgalloc.h
@@ -54,9 +54,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
struct page *pte;
pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
- if (pte) {
- clear_highpage(pte);
- pgtable_page_ctor(pte);
+ if (!pte)
+ return NULL;
+ clear_highpage(pte);
+ if (!pgtable_page_ctor(pte)) {
+ __free_page(pte);
+ return NULL;
}
return pte;
}