From 356cdd5f38d5fb6cb8bd3b32c9b8a3bf18932fe1 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:55 +0100 Subject: [PATCH] Revert "FROMGIT: KVM: arm64: Extend pkvm_page_state enumeration to handle absent pages" This reverts commit d9acb48aed9352e70f7e822266c60a62e225632e. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I4024f39043bf4e7a82ed2cb0b9152c29d715c1da --- arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h index 56445586c755..b58c910babaf 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h @@ -24,11 +24,6 @@ enum pkvm_page_state { PKVM_PAGE_OWNED = 0ULL, PKVM_PAGE_SHARED_OWNED = KVM_PGTABLE_PROT_SW0, PKVM_PAGE_SHARED_BORROWED = KVM_PGTABLE_PROT_SW1, - __PKVM_PAGE_RESERVED = KVM_PGTABLE_PROT_SW0 | - KVM_PGTABLE_PROT_SW1, - - /* Meta-states which aren't encoded directly in the PTE's SW bits */ - PKVM_NOPAGE, }; #define PKVM_PAGE_STATE_PROT_MASK (KVM_PGTABLE_PROT_SW0 | KVM_PGTABLE_PROT_SW1)