From mboxrd@z Thu Jan 1 00:00:00 1970 From: suzuki.poulose@arm.com (Suzuki K Poulose) Date: Tue, 9 Jan 2018 19:03:59 +0000 Subject: [PATCH v1 04/16] arm64: Refactor pud_huge for reusability In-Reply-To: <20180109190414.4017-1-suzuki.poulose@arm.com> References: <20180109190414.4017-1-suzuki.poulose@arm.com> Message-ID: <20180109190414.4017-5-suzuki.poulose@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Make pud_huge reusable for stage2 tables, independent of the stage1 levels. Cc: Steve Capper Cc: Mark Rutland Cc: Will Deacon Cc: Catalin Marinas Signed-off-by: Suzuki K Poulose --- arch/arm64/include/asm/pgtable.h | 5 +++++ arch/arm64/mm/hugetlbpage.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index a5a5203b603d..a1c6e93a1a11 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -469,6 +469,11 @@ static inline phys_addr_t pmd_page_paddr(pmd_t pmd) #define __raw_pud_bad(pud) (!(pud_val((pud)) & PUD_TABLE_BIT)) #define __raw_pud_present(pud) pte_present(pud_pte((pud))) +static inline int __raw_pud_huge(pud_t pud) +{ + return pud_val(pud) && !(pud_val(pud) & PUD_TABLE_BIT); +} + static inline void __raw_set_pud(pud_t *pudp, pud_t pud) { *pudp = pud; diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 6cb0fa92a651..a6bd5cc3d88b 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -35,7 +35,7 @@ int pmd_huge(pmd_t pmd) int pud_huge(pud_t pud) { #ifndef __PAGETABLE_PMD_FOLDED - return pud_val(pud) && !(pud_val(pud) & PUD_TABLE_BIT); + return __raw_pud_huge(pud); #else return 0; #endif -- 2.13.6