Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/fsl', 'asoc/fix/tegra...

[linux-drm-fsl-dcu.git] / arch / arc / include / asm / pgalloc.h

diff --git a/arch/arc/include/asm/pgalloc.h b/arch/arc/include/asm/pgalloc.h
index 36a9f20c21a356988e09287939c1a1dc9f5ae211..81208bfd9dcbc460c9875ad509bb0cb11348c07e 100644 (file)
--- a/arch/arc/include/asm/pgalloc.h
+++ b/arch/arc/include/asm/pgalloc.h
@@ -105,11 +105,16 @@ static inline pgtable_t
 pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
        pgtable_t pte_pg;
+       struct page *page;
 
        pte_pg = __get_free_pages(GFP_KERNEL | __GFP_REPEAT, __get_order_pte());
-       if (pte_pg) {
-               memzero((void *)pte_pg, PTRS_PER_PTE * 4);
-               pgtable_page_ctor(virt_to_page(pte_pg));
+       if (!pte_pg)
+               return 0;
+       memzero((void *)pte_pg, PTRS_PER_PTE * 4);
+       page = virt_to_page(pte_pg);
+       if (!pgtable_page_ctor(page)) {
+               __free_page(page);
+               return 0;
        }
 
        return pte_pg;