From 873a7c423bf8f12bff48a4b8963b32be568b4fcf Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 13 Dec 2006 00:34:14 -0800 Subject: [PATCH] KVM: Disallow the kvm-amd module on intel hardware, and vice versa They're not on speaking terms. Signed-off-by: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/kvm/vmx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/kvm/vmx.c') diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 43622061660b..d046296a9304 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -2000,8 +2000,7 @@ static struct kvm_arch_ops vmx_arch_ops = { static int __init vmx_init(void) { - kvm_init_arch(&vmx_arch_ops, THIS_MODULE); - return 0; + return kvm_init_arch(&vmx_arch_ops, THIS_MODULE); } static void __exit vmx_exit(void) -- cgit v1.2.3