unicore32: handle pgtable_page_ctor() fail
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Thu, 14 Nov 2013 22:31:46 +0000 (14:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Nov 2013 00:32:19 +0000 (09:32 +0900)
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>
arch/unicore32/include/asm/pgalloc.h

index 0213e37..2e02d13 100644 (file)
@@ -51,12 +51,14 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr)
        struct page *pte;
 
        pte = alloc_pages(PGALLOC_GFP, 0);
        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;
        }
 
        return pte;