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

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

powerpc/mm/radix: rename _PAGE_LARGE to R_PAGE_LARGE 



This bit is only used by radix and it is nice to follow the naming style of having
bit name start with H_/R_ depending on which translation mode they are used.

No functional change in this patch.

Reviewed-by: default avatarPaul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent f5bd0fdc

arch/powerpc/include/asm/book3s/64/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma, 
	 */

	VM_WARN_ON(page_shift == mmu_psize_defs[MMU_PAGE_1G].shift);

	if (page_shift == mmu_psize_defs[MMU_PAGE_2M].shift)

		return __pte(pte_val(entry) | _PAGE_LARGE);

		return __pte(pte_val(entry) | R_PAGE_LARGE);

	else

		return entry;

}

arch/powerpc/include/asm/book3s/64/radix.h

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
/*

 * For P9 DD1 only, we need to track whether the pte's huge.

 */

#define _PAGE_LARGE	_RPAGE_RSV1

#define R_PAGE_LARGE	_RPAGE_RSV1





#ifndef __ASSEMBLY__
@@ -258,7 +258,7 @@ static inline int radix__pmd_trans_huge(pmd_t pmd) 
static inline pmd_t radix__pmd_mkhuge(pmd_t pmd)

{

	if (cpu_has_feature(CPU_FTR_POWER9_DD1))

		return __pmd(pmd_val(pmd) | _PAGE_PTE | _PAGE_LARGE);

		return __pmd(pmd_val(pmd) | _PAGE_PTE | R_PAGE_LARGE);

	return __pmd(pmd_val(pmd) | _PAGE_PTE);

}

static inline void radix__pmdp_huge_split_prepare(struct vm_area_struct *vma,

arch/powerpc/mm/tlb-radix.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ void radix__flush_tlb_pte_p9_dd1(unsigned long old_pte, struct mm_struct *mm, 
		return;

	}



	if (old_pte & _PAGE_LARGE)

	if (old_pte & R_PAGE_LARGE)

		radix__flush_tlb_page_psize(mm, address, MMU_PAGE_2M);

	else

		radix__flush_tlb_page_psize(mm, address, mmu_virtual_psize);