3 files changed, 12 insertions, 5 deletions

diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
index f65e27b09bd3..16cb92d215d2 100644
--- a/arch/powerpc/include/asm/pgalloc-64.h
+++ b/arch/powerpc/include/asm/pgalloc-64.h
@@ -91,7 +91,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
         if (!pte)
                 return NULL;
         page = virt_to_page(pte);
-        pgtable_page_ctor(page);
+        if (!pgtable_page_ctor(page)) {
+                __free_page(page);
+                return NULL;
+        }
         return page;
 }
 
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 6c856fb8c15b..5b9601715289 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -121,7 +121,10 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
         ptepage = alloc_pages(flags, 0);
         if (!ptepage)
                 return NULL;
-        pgtable_page_ctor(ptepage);
+        if (!pgtable_page_ctor(ptepage)) {
+                __free_page(ptepage);
+                return NULL;
+        }
         return ptepage;
 }
 
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 536eec72c0f7..9d95786aa80f 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -378,6 +378,10 @@ static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel)
                                        __GFP_REPEAT | __GFP_ZERO);
         if (!page)
                 return NULL;
+        if (!kernel && !pgtable_page_ctor(page)) {
+                __free_page(page);
+                return NULL;
+        }
 
         ret = page_address(page);
         spin_lock(&mm->page_table_lock);
@@ -392,9 +396,6 @@ static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel)
         }
         spin_unlock(&mm->page_table_lock);
 
-        if (!kernel)
-                pgtable_page_ctor(page);
-
         return (pte_t *)ret;
 }