diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-11-14 17:31:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:18 -0500 |
commit | 96da3a62ea1fef2d9dfa8eff97706603918d5f4d (patch) | |
tree | a3d9ba07d6df133fe65f708efdb7d33b5b059960 | |
parent | e89cfa58a8358fdb4d4e79936c25222416ad415e (diff) |
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>
-rw-r--r-- | arch/score/include/asm/pgalloc.h | 9 |
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, | |||
54 | struct page *pte; | 54 | struct page *pte; |
55 | 55 | ||
56 | pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER); | 56 | pte = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER); |
57 | if (pte) { | 57 | if (!pte) |
58 | clear_highpage(pte); | 58 | return NULL; |
59 | pgtable_page_ctor(pte); | 59 | clear_highpage(pte); |
60 | if (!pgtable_page_ctor(pte)) { | ||
61 | __free_page(pte); | ||
62 | return NULL; | ||
60 | } | 63 | } |
61 | return pte; | 64 | return pte; |
62 | } | 65 | } |