arc: handle pgtable_page_ctor() fail
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Thu, 14 Nov 2013 22:31:25 +0000 (14:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Nov 2013 00:32:16 +0000 (09:32 +0900)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com> [for arch/arc bits]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/arc/include/asm/pgalloc.h

index 36a9f20..81208bf 100644 (file)
@@ -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;