---

yaml --- r: 45135 b: refs/heads/master c: 09db28b h: refs/heads/master i: 45133: dfd177c 45131: 856796f 45127: 2074903 45119: 4568485 v: v3
git-mirror · Dec 30, 2006 · c08d8ec · c08d8ec
1 parent 4a0a8da
commit c08d8ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9058ecd3cd72634cf548588ce79b3f225c9ca32
+refs/heads/master: 09db28b8a3765a7ec35eba80420c71a7973f5a88
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
@@ -1865,6 +1865,11 @@ int kvm_init_arch(struct kvm_arch_ops *ops, struct module *module)
 {
 	int r;
 
+	if (kvm_arch_ops) {
+		printk(KERN_ERR "kvm: already loaded the other module\n");
+		return -EEXIST;
+	}
+
 	kvm_arch_ops = ops;
 
 	if (!kvm_arch_ops->cpu_has_kvm_support()) {
@@ -1907,6 +1912,7 @@ void kvm_exit_arch(void)
 	unregister_reboot_notifier(&kvm_reboot_notifier);
 	on_each_cpu(kvm_arch_ops->hardware_disable, 0, 0, 1);
 	kvm_arch_ops->hardware_unsetup();
+	kvm_arch_ops = NULL;
 }
 
 static __init int kvm_init(void)