diff options
| author | Avi Kivity <avi@qumranet.com> | 2006-12-13 00:34:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:05:48 -0800 |
| commit | 873a7c423bf8f12bff48a4b8963b32be568b4fcf (patch) | |
| tree | 947beeefe93c4b90807d188ec15271218673a3f5 /drivers/kvm/vmx.c | |
| parent | 802ba064c49f655d20fed563f2a4924c8256ea10 (diff) | |
| download | op-kernel-dev-873a7c423bf8f12bff48a4b8963b32be568b4fcf.zip op-kernel-dev-873a7c423bf8f12bff48a4b8963b32be568b4fcf.tar.gz | |
[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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 4362206..d046296 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) |
