summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-06-14 21:22:15 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-06-14 21:22:15 +0900
commitbff7b55bdb325f62c4e30a97883ebd2b536bd47b (patch)
treede4ab64ec0837ae308e17312b553e9a5209b6f62 /virt
parente7fad451f06e21e74b6051c5ad4917e37460be3a (diff)
parent44b7532b8b464f606053562400719c9c21276037 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index e21194566b7..764554350ed 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2604,7 +2604,6 @@ 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)