unicore32: handle pgtable_page_ctor() fail

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/arch/unicore32/include/asm/pgalloc.h b/arch/unicore32/include/asm/pgalloc.h
index 0213e373a895..2e02d1356fdf 100644
--- a/arch/unicore32/include/asm/pgalloc.h
+++ b/arch/unicore32/include/asm/pgalloc.h
@@ -51,12 +51,14 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr)
         struct page *pte;
 
         pte = alloc_pages(PGALLOC_GFP, 0);
-        if (pte) {
-                if (!PageHighMem(pte)) {
-                        void *page = page_address(pte);
-                        clean_dcache_area(page, PTRS_PER_PTE * sizeof(pte_t));
-                }
-                pgtable_page_ctor(pte);
+        if (!pte)
+                return NULL;
+        if (!PageHighMem(pte)) {
+                void *page = page_address(pte);
+                clean_dcache_area(page, PTRS_PER_PTE * sizeof(pte_t));
+        }
+        if (!pgtable_page_ctor(pte)) {
+                __free_page(pte);
         }
 
         return pte;