diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-09-25 09:28:58 +0200 |
commit | 9c9ab385bc6c3f0787f742d5e9baf04063d9697a (patch) | |
tree | cc6ac425f7580a40d011ad2e8fc7974678843e0b /arch/arm/kvm/Kconfig | |
parent | 93f13a9f96771a064c716364aebc6e283b186eb8 (diff) | |
parent | bcee19f424a0d8c26ecf2607b73c690802658b29 (diff) | |
download | talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.tar.gz talos-op-linux-9c9ab385bc6c3f0787f742d5e9baf04063d9697a.zip |
Merge branch 'linus' into x86/asm, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kvm/Kconfig')
-rw-r--r-- | arch/arm/kvm/Kconfig | 11 |
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 |