From 883baeb55aa4deb3f550c0c2be4d9fe5352034b2 Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Thu, 6 Jan 2022 11:09:04 +0000 Subject: [PATCH] Revert "FROMLIST: KVM: arm64: Extend pkvm_page_state enumeration to handle absent pages" This reverts commit f80bdbb276ec70c1a5386ac665aafc392984c2bc. This will be replaced by a FROMGIT patch shortly. Signed-off-by: Quentin Perret Change-Id: I81ee72a29d8884474b17e944183e9d3372dfdab8 --- 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)