OSDN Git Service

Merge branch kvm-arm64/hyp-header-split into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 7 Dec 2021 09:14:49 +0000 (09:14 +0000)
committerMarc Zyngier <maz@kernel.org>
Tue, 7 Dec 2021 09:14:49 +0000 (09:14 +0000)
* kvm-arm64/hyp-header-split:
  : .
  : Tidy up the header file usage for the nvhe hyp object so
  : that header files under arch/arm64/kvm/hyp/include are not
  : included by host code running at EL1.
  : .
  KVM: arm64: Move host EL1 code out of hyp/ directory
  KVM: arm64: Generate hyp_constants.h for the host
  arm64: Add missing include of asm/cpufeature.h to asm/mmu.h

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

Trivial merge