diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 12:05:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 12:05:48 -0400 |
| commit | c7e9cb4c0c6d6807e9b07ec1b01fecac0c7b0532 (patch) | |
| 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
| -rw-r--r-- | virt/kvm/kvm_main.c | 1 |
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, | |||
| 2305 | r = -ENOMEM; | 2305 | r = -ENOMEM; |
| 2306 | goto out_free_0; | 2306 | goto out_free_0; |
| 2307 | } | 2307 | } |
| 2308 | cpumask_clear(cpus_hardware_enabled); | ||
| 2308 | 2309 | ||
| 2309 | r = kvm_arch_hardware_setup(); | 2310 | r = kvm_arch_hardware_setup(); |
| 2310 | if (r < 0) | 2311 | if (r < 0) |