From 189c8d1b2436cbb4872671c4b3018dc2836b131b Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:25 +0100 Subject: [PATCH] Revert "ANDROID: arm64: Add a helper to retrieve the PTE of a fixmap" This reverts commit 41fd5d58f9c5c5ee5fa2c8eac153c4cd83cd2676. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I59518f257a79359efbc19742a750dc1676daffc2 --- arch/arm64/include/asm/fixmap.h | 2 -- arch/arm64/mm/mmu.c | 15 --------------- 2 files changed, 17 deletions(-) diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h index f4b7a1c1e522..daff882883f9 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -107,8 +107,6 @@ void __init early_fixmap_init(void); extern void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot); -extern pte_t *__get_fixmap_pte(enum fixed_addresses idx); - #include #endif /* !__ASSEMBLY__ */ diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 39d352ef12b7..99667fd786dd 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1332,21 +1332,6 @@ void __set_fixmap(enum fixed_addresses idx, } } -pte_t *__get_fixmap_pte(enum fixed_addresses idx) -{ - unsigned long addr = __fix_to_virt(idx); - pte_t *ptep; - - BUG_ON(idx <= FIX_HOLE || idx >= __end_of_fixed_addresses); - - ptep = fixmap_pte(addr); - - if (!pte_valid(*ptep)) - return NULL; - - return ptep; -} - void *__init fixmap_remap_fdt(phys_addr_t dt_phys, int *size, pgprot_t prot) { const u64 dt_virt_base = __fix_to_virt(FIX_FDT);