summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2009-06-08 18:05:48 +0200
committerLinus Torvalds2009-06-08 18:05:48 +0200
commitc7e9cb4c0c6d6807e9b07ec1b01fecac0c7b0532 (patch)
tree8b314b85cec0540dfbe3d7edc713af2475e7a1f1
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bar... (diff)
parentKVM: Explicity initialize cpus_hardware_enabled (diff)
downloadkernel-qcow2-linux-c7e9cb4c0c6d6807e9b07ec1b01fecac0c7b0532.tar.gz
kernel-qcow2-linux-c7e9cb4c0c6d6807e9b07ec1b01fecac0c7b0532.tar.xz
kernel-qcow2-linux-c7e9cb4c0c6d6807e9b07ec1b01fecac0c7b0532.zip
Merge branch 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Explicity initialize cpus_hardware_enabled
-rw-r--r--virt/kvm/kvm_main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 1ecbe2391c8b..4293528200b3 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2305,6 +2305,7 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
r = -ENOMEM;
goto out_free_0;
}
+ cpumask_clear(cpus_hardware_enabled);
r = kvm_arch_hardware_setup();
if (r < 0)