diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-11-14 17:31:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:18 -0500 |
commit | bc16640dce9035177c99d8fb11d3b94abe9f36c8 (patch) | |
tree | 73dfd6d7f7349d4fd4c94bce3ac889d9461f396c /arch/parisc | |
parent | 3b5b51c1a7bd148e1d7721874849435d76728375 (diff) |
parisc: handle pgtable_page_ctor() fail
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/parisc')
-rw-r--r-- | arch/parisc/include/asm/pgalloc.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h index fc987a1c12a8..f213f5b4c423 100644 --- a/arch/parisc/include/asm/pgalloc.h +++ b/arch/parisc/include/asm/pgalloc.h | |||
@@ -121,8 +121,12 @@ static inline pgtable_t | |||
121 | pte_alloc_one(struct mm_struct *mm, unsigned long address) | 121 | pte_alloc_one(struct mm_struct *mm, unsigned long address) |
122 | { | 122 | { |
123 | struct page *page = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); | 123 | struct page *page = alloc_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO); |
124 | if (page) | 124 | if (!page) |
125 | pgtable_page_ctor(page); | 125 | return NULL; |
126 | if (!pgtable_page_ctor(page)) { | ||
127 | __free_page(page); | ||
128 | return NULL; | ||
129 | } | ||
126 | return page; | 130 | return page; |
127 | } | 131 | } |
128 | 132 | ||