From: Marc Zyngier <maz@kernel.org>
Date: Wed, 15 Dec 2021 14:21:23 +0000 (+0000)
Subject: Merge branch kvm-arm64/pkvm-cleanups-5.17 into kvmarm-master/next
X-Git-Tag: v5.17-rc1~15^2~96^2~5
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7b6871f670028532430648a175d9e8e72280172a;p=linux-block.git

Merge branch kvm-arm64/pkvm-cleanups-5.17 into kvmarm-master/next

* kvm-arm64/pkvm-cleanups-5.17:
  : .
  : pKVM cleanups from Quentin Perret:
  :
  : This series is a collection of various fixes and cleanups for KVM/arm64
  : when running in nVHE protected mode. The first two patches are real
  : fixes/improvements, the following two are minor cleanups, and the last
  : two help satisfy my paranoia so they're certainly optional.
  : .
  KVM: arm64: pkvm: Make kvm_host_owns_hyp_mappings() robust to VHE
  KVM: arm64: pkvm: Stub io map functions
  KVM: arm64: Make __io_map_base static
  KVM: arm64: Make the hyp memory pool static
  KVM: arm64: pkvm: Disable GICv2 support
  KVM: arm64: pkvm: Fix hyp_pool max order

Signed-off-by: Marc Zyngier <maz@kernel.org>
---

7b6871f670028532430648a175d9e8e72280172a
diff --cc arch/arm64/kvm/hyp/include/nvhe/mm.h
index ef6a58a04235,5ed5ba637d00..2d08510c6cc1
--- a/arch/arm64/kvm/hyp/include/nvhe/mm.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/mm.h
@@@ -10,10 -10,11 +10,8 @@@
  #include <nvhe/memory.h>
  #include <nvhe/spinlock.h>
  
 -#define HYP_MEMBLOCK_REGIONS 128
 -extern struct memblock_region kvm_nvhe_sym(hyp_memory)[];
 -extern unsigned int kvm_nvhe_sym(hyp_memblock_nr);
  extern struct kvm_pgtable pkvm_pgtable;
  extern hyp_spinlock_t pkvm_pgd_lock;
- extern struct hyp_pool hpool;
- extern u64 __io_map_base;
  
  int hyp_create_idmap(u32 hyp_va_bits);
  int hyp_map_vectors(void);