diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-11-14 17:31:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:17 -0500 |
commit | 0da5303bdb55e67963e8b53ebf3a2aa75051cab4 (patch) | |
tree | 103a346256913e9012bd2e0d7c8000fe84c00799 /arch/cris/include | |
parent | 2cb6182bb6153f685c37773687e63094317b1eeb (diff) |
cris: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Mikael Starvik <starvik@axis.com>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/include')
-rw-r--r-- | arch/cris/include/asm/pgalloc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/cris/include/asm/pgalloc.h b/arch/cris/include/asm/pgalloc.h index d9504d38c276..235ece437ddd 100644 --- a/arch/cris/include/asm/pgalloc.h +++ b/arch/cris/include/asm/pgalloc.h | |||
@@ -34,7 +34,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres | |||
34 | pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); | 34 | pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); |
35 | if (!pte) | 35 | if (!pte) |
36 | return NULL; | 36 | return NULL; |
37 | pgtable_page_ctor(pte); | 37 | if (!pgtable_page_ctor(pte)) { |
38 | __free_page(pte); | ||
39 | return NULL; | ||
40 | } | ||
38 | return pte; | 41 | return pte; |
39 | } | 42 | } |
40 | 43 | ||