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

Commit 1ecf2cdc authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm: pmd_devmap implies pmd_large(). 



large devmap usage is dependent on THP. Hence once check is sufficient.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d6eacedd

arch/powerpc/mm/book3s64/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, 


	WARN_ON(pte_hw_valid(pmd_pte(*pmdp)) && !pte_protnone(pmd_pte(*pmdp)));

	assert_spin_locked(pmd_lockptr(mm, pmdp));

	WARN_ON(!(pmd_large(pmd) || pmd_devmap(pmd)));

	WARN_ON(!(pmd_large(pmd)));

#endif

	trace_hugepage_set_pmd(addr, pmd_val(pmd));

	return set_pte_at(mm, addr, pmdp_ptep(pmdp), pmd_pte(pmd));

arch/powerpc/mm/pgtable_64.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ struct page *pud_page(pud_t pud) 
struct page *pmd_page(pmd_t pmd)

{

	if (pmd_is_leaf(pmd)) {

		VM_WARN_ON(!(pmd_large(pmd) || pmd_huge(pmd) || pmd_devmap(pmd)));

		VM_WARN_ON(!(pmd_large(pmd) || pmd_huge(pmd)));

		return pte_page(pmd_pte(pmd));

	}

	return virt_to_page(pmd_page_vaddr(pmd));