From f2d947d793acd69c83be556db1db67e5f00e183a Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:57 +0100 Subject: [PATCH] Revert "FROMGIT: KVM: arm64: Provide {get,put}_page() stubs for early hyp allocator" This reverts commit 830bf938c49ce4f98391f527c3ce4585ab8561c2. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I5916a1fe2fa933675c907844b7dae7acd5c07dab --- arch/arm64/kvm/hyp/nvhe/early_alloc.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/early_alloc.c b/arch/arm64/kvm/hyp/nvhe/early_alloc.c index 00de04153cc6..1306c430ab87 100644 --- a/arch/arm64/kvm/hyp/nvhe/early_alloc.c +++ b/arch/arm64/kvm/hyp/nvhe/early_alloc.c @@ -43,9 +43,6 @@ void *hyp_early_alloc_page(void *arg) return hyp_early_alloc_contig(1); } -static void hyp_early_alloc_get_page(void *addr) { } -static void hyp_early_alloc_put_page(void *addr) { } - void hyp_early_alloc_init(void *virt, unsigned long size) { base = cur = (unsigned long)virt; @@ -54,6 +51,4 @@ void hyp_early_alloc_init(void *virt, unsigned long size) hyp_early_alloc_mm_ops.zalloc_page = hyp_early_alloc_page; hyp_early_alloc_mm_ops.phys_to_virt = hyp_phys_to_virt; hyp_early_alloc_mm_ops.virt_to_phys = hyp_virt_to_phys; - hyp_early_alloc_mm_ops.get_page = hyp_early_alloc_get_page; - hyp_early_alloc_mm_ops.put_page = hyp_early_alloc_put_page; }