aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/vmx.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2006-12-13 03:34:14 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-13 12:05:48 -0500
commit873a7c423bf8f12bff48a4b8963b32be568b4fcf (patch)
tree947beeefe93c4b90807d188ec15271218673a3f5 /drivers/kvm/vmx.c
parent802ba064c49f655d20fed563f2a4924c8256ea10 (diff)
[PATCH] KVM: Disallow the kvm-amd module on intel hardware, and vice versa
They're not on speaking terms. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/kvm/vmx.c')
-rw-r--r--drivers/kvm/vmx.c3
1 files changed, 1 insertions, 2 deletions
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 = {
2000 2000
2001static int __init vmx_init(void) 2001static int __init vmx_init(void)
2002{ 2002{
2003 kvm_init_arch(&vmx_arch_ops, THIS_MODULE); 2003 return kvm_init_arch(&vmx_arch_ops, THIS_MODULE);
2004 return 0;
2005} 2004}
2006 2005
2007static void __exit vmx_exit(void) 2006static void __exit vmx_exit(void)