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

Commit 1ae9ae5f authored Nov 14, 2013 by Kirill A. Shutemov Committed by Linus Torvalds Nov 15, 2013

sparc: handle pgtable_page_ctor() fail



Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 478cf8ca

arch/sparc/mm/init_64.c

+6 −5

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

	page = __alloc_for_cache(mm);		page = __alloc_for_cache(mm);
	if (page) {		if (!page)
	pgtable_page_ctor(page);		return NULL;
	pte = (pte_t *) page_address(page);		if (!pgtable_page_ctor(page)) {
			free_hot_cold_page(page, 0);
			return NULL;
	}		}
			return (pte_t *) page_address(page);
	return pte;
	}		}

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

arch/sparc/mm/srmmu.c

+4 −1

Original line number	Original line	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)		if ((pte = (unsigned long)pte_alloc_one_kernel(mm, address)) == 0)
	return NULL;		return NULL;
	page = pfn_to_page(__nocache_pa(pte) >> PAGE_SHIFT);		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;		return page;
	}		}