aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kvm/Kconfig
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-09-17 16:51:59 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-09-17 16:51:59 +0200
commitefe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648 (patch)
treee7261ab57ded208c8425797e052ae562343ee618 /arch/arm/kvm/Kconfig
parentKVM: s390: Replace incorrect atomic_or with atomic_andnot (diff)
parentarm/arm64: KVM: Remove 'config KVM_ARM_MAX_VCPUS' (diff)
downloadlinux-dev-efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648.tar.xz
linux-dev-efe4d36a75d4dfd1a9c161b2bbf9b90beb4d9648.zip
Merge tag 'kvm-arm-for-4.3-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
Second set of KVM/ARM changes for 4.3-rc2 - Workaround for a Cortex-A57 erratum - Bug fix for the debugging infrastructure - Fix for 32bit guests with more than 4GB of address space on a 32bit host - A number of fixes for the (unusual) case when we don't use the in-kernel GIC emulation - Removal of ThumbEE handling on arm64, since these have been dropped from the architecture before anyone actually ever built a CPU - Remove the KVM_ARM_MAX_VCPUS limitation which has become fairly pointless
Diffstat (limited to 'arch/arm/kvm/Kconfig')
-rw-r--r--arch/arm/kvm/Kconfig11
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig
index bfb915d05665..210eccadb69a 100644
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@ -45,15 +45,4 @@ config KVM_ARM_HOST
---help---
Provides host support for ARM processors.
-config KVM_ARM_MAX_VCPUS
- int "Number maximum supported virtual CPUs per VM"
- depends on KVM_ARM_HOST
- default 4
- help
- Static number of max supported virtual CPUs per VM.
-
- If you choose a high number, the vcpu structures will be quite
- large, so only choose a reasonable number that you expect to
- actually use.
-
endif # VIRTUALIZATION