Commit 1ae9ae5f authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

sparc: handle pgtable_page_ctor() fail 



Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 478cf8ca

arch/sparc/mm/init_64.c

+6 −5
Original line number Diff line number Diff line
@@ -2519,12 +2519,13 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, 
		return pte;



	page = __alloc_for_cache(mm);

	if (page) {

		pgtable_page_ctor(page);

		pte = (pte_t *) page_address(page);

	if (!page)

		return NULL;

	if (!pgtable_page_ctor(page)) {

		free_hot_cold_page(page, 0);

		return NULL;

	}



	return pte;

	return (pte_t *) page_address(page);

}



void pte_free_kernel(struct mm_struct *mm, pte_t *pte)

arch/sparc/mm/srmmu.c

+4 −1
Original line number Diff line number Diff line
@@ -345,7 +345,10 @@ pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) 
	if ((pte = (unsigned long)pte_alloc_one_kernel(mm, address)) == 0)

		return NULL;

	page = pfn_to_page(__nocache_pa(pte) >> PAGE_SHIFT);

	pgtable_page_ctor(page);

	if (!pgtable_page_ctor(page)) {

		__free_page(page);

		return NULL;

	}

	return page;

}