commit | c7e9cb4c0c6d6807e9b07ec1b01fecac0c7b0532 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 08 09:05:48 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 08 09:05:48 2009 -0700 |
tree | 8b314b85cec0540dfbe3d7edc713af2475e7a1f1 | |
parent | c46f87f121f815a67e84379511310e5c03862a60 [diff] | |
parent | a4c0364be3f43d3e17fe19270f8b3d64881606e6 [diff] |
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
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 1ecbe23..4293528 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c
@@ -2305,6 +2305,7 @@ r = -ENOMEM; goto out_free_0; } + cpumask_clear(cpus_hardware_enabled); r = kvm_arch_hardware_setup(); if (r < 0)