diff options
| author | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /virt | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'virt')
| -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) |