Merge tag 'kvm-arm-removal' into kvmarm-master/next (46305059) · Commits · jan.koester / Linux

Documentation/virt/kvm/arm/hyp-abi.rst

+5 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,11 @@ hypervisor when running as a guest (under Xen, KVM or any other
		hypervisor), or any hypervisor-specific interaction when the kernel is
		used as a host.

		Note: KVM/arm has been removed from the kernel. The API described
		here is still valid though, as it allows the kernel to kexec when
		booted at HYP. It can also be used by a hypervisor other than KVM
		if necessary.

		On arm and arm64 (without VHE), the kernel doesn't run in hypervisor
		mode, but still needs to interact with it, allowing a built-in
		hypervisor to be either installed or torn down.

+1 −4

Original line number	Diff line number	Diff line
		@@ -9164,7 +9164,7 @@ F: virt/kvm/*
		F: tools/kvm/
		F: tools/testing/selftests/kvm/

		KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
		KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
		M: Marc Zyngier <maz@kernel.org>
		R: James Morse <james.morse@arm.com>
		R: Julien Thierry <julien.thierry.kdev@gmail.com>
		@@ -9173,9 +9173,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: kvmarm@lists.cs.columbia.edu
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
		S: Maintained
		F: arch/arm/include/uapi/asm/kvm*
		F: arch/arm/include/asm/kvm*
		F: arch/arm/kvm/
		F: arch/arm64/include/uapi/asm/kvm*
		F: arch/arm64/include/asm/kvm*
		F: arch/arm64/kvm/

+0 −2

Original line number	Diff line number	Diff line
		@@ -2091,5 +2091,3 @@ source "drivers/firmware/Kconfig"
		if CRYPTO
		source "arch/arm/crypto/Kconfig"
		endif

		source "arch/arm/kvm/Kconfig"

+0 −1

Original line number	Diff line number	Diff line
		@@ -278,7 +278,6 @@ core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/
		core-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/))
		core-$(CONFIG_VFP) += arch/arm/vfp/
		core-$(CONFIG_XEN) += arch/arm/xen/
		core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/
		core-$(CONFIG_VDSO) += arch/arm/vdso/

		# If we have a machine-specific directory, then include it in the build.

+0 −2

Original line number	Diff line number	Diff line
		@@ -236,5 +236,3 @@ CONFIG_CRYPTO_GCM=y
		CONFIG_CRYPTO_XCBC=y
		CONFIG_CRYPTO_SHA256=y
		# CONFIG_CRYPTO_ANSI_CPRNG is not set
		CONFIG_VIRTUALIZATION=y
		CONFIG_KVM=y