Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f804943 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

powerpc: handle pgtable_page_ctor() fail 



Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc16640d

arch/powerpc/include/asm/pgalloc-64.h

+4 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/powerpc/mm/pgtable_32.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/powerpc/mm/pgtable_64.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

}