summaryrefslogtreecommitdiff
path: root/arch/arm64/kvm/hyp/nvhe/pkvm.c
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2021-10-13 15:03:43 +0300
committerMarc Zyngier <maz@kernel.org>2021-10-18 18:57:09 +0300
commit3061725d162cad0589b012fc6413c9dd0da8f02a (patch)
tree9f0591c5cb38ef4bc08980074ada98bb20d32b4f /arch/arm64/kvm/hyp/nvhe/pkvm.c
parent271b7286058da636ab6f5f47722e098ca3a0478b (diff)
downloadlinux-3061725d162cad0589b012fc6413c9dd0da8f02a.tar.xz
KVM: arm64: pkvm: Consolidate include files
kvm_fixed_config.h is pkvm specific, and would be better placed near its users. At the same time, include/nvhe/sys_regs.h is now almost empty. Merge the two into arch/arm64/kvm/hyp/include/nvhe/fixed_config.h. Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Fuad Tabba <tabba@google.com> Tested-by: Fuad Tabba <tabba@google.com> Link: https://lore.kernel.org/r/20211013120346.2926621-9-maz@kernel.org
Diffstat (limited to 'arch/arm64/kvm/hyp/nvhe/pkvm.c')
-rw-r--r--arch/arm64/kvm/hyp/nvhe/pkvm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
index 62377fa8a4cb..99c8d8b73e70 100644
--- a/arch/arm64/kvm/hyp/nvhe/pkvm.c
+++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c
@@ -6,8 +6,7 @@
#include <linux/kvm_host.h>
#include <linux/mm.h>
-#include <asm/kvm_fixed_config.h>
-#include <nvhe/sys_regs.h>
+#include <nvhe/fixed_config.h>
#include <nvhe/trap_handler.h>
/*