From: David Daney <david.da...@cavium.com>
Also let CPU_CAVIUM_OCTEON select KVM.
Signed-off-by: David Daney <david.da...@cavium.com>
---
arch/mips/Kconfig | 1 +
arch/mips/kvm/Kconfig | 9 +++++++++
arch/mips/kvm/Makefile | 1 +
3 files changed, 11 insertions(+)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7a58ab9..16e3d22 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1426,6 +1426,7 @@ config CPU_CAVIUM_OCTEON
select LIBFDT
select USE_OF
select USB_EHCI_BIG_ENDIAN_MMIO
+ select HAVE_KVM
help
The Cavium Octeon processor is a highly integrated chip containing
many ethernet hardware widgets for networking tasks. The processor
diff --git a/arch/mips/kvm/Kconfig b/arch/mips/kvm/Kconfig
index 95c0d22..32a5016 100644
--- a/arch/mips/kvm/Kconfig
+++ b/arch/mips/kvm/Kconfig
@@ -48,6 +48,15 @@ config KVM_MIPS_DEBUG_COP0_COUNTERS
If unsure, say N.
+config KVM_MIPSVZ
+ bool "Kernel-based Virtual Machine (KVM) using hardware MIPS-VZ support"
+ depends on HAVE_KVM
+ select KVM
+ ---help---
+ Support for hosting Guest kernels on hardware with the
+ MIPS-VZ hardware module.
+
+
source drivers/vhost/Kconfig
endif # VIRTUALIZATION
diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile
index 3377197..595358f 100644
--- a/arch/mips/kvm/Makefile
+++ b/arch/mips/kvm/Makefile
@@ -13,3 +13,4 @@ kvm_mipste-objs := kvm_mips_emul.o kvm_locore.o
kvm_mips_int.o \
obj-$(CONFIG_KVM) += $(common-objs) kvm_mips.o
obj-$(CONFIG_KVM_MIPSTE) += kvm_mipste.o
+obj-$(CONFIG_KVM_MIPSVZ) += kvm_mipsvz.o kvm_mipsvz_guest.o
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
