diff options
| author | Avi Kivity <avi@qumranet.com> | 2006-12-13 08:34:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 17:05:48 (GMT) |
| commit | 873a7c423bf8f12bff48a4b8963b32be568b4fcf (patch) | |
| tree | 947beeefe93c4b90807d188ec15271218673a3f5 /drivers/kvm/svm.c | |
| parent | 802ba064c49f655d20fed563f2a4924c8256ea10 (diff) | |
| download | linux-fsl-qoriq-873a7c423bf8f12bff48a4b8963b32be568b4fcf.tar.xz | |
[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/svm.c')
| -rw-r--r-- | drivers/kvm/svm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 73a022c..0e6bc8c 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -377,6 +377,7 @@ static __init int svm_hardware_setup(void) void *msrpm_va; int r; + kvm_emulator_want_group7_invlpg(); iopm_pages = alloc_pages(GFP_KERNEL, IOPM_ALLOC_ORDER); @@ -1628,9 +1629,7 @@ static struct kvm_arch_ops svm_arch_ops = { static int __init svm_init(void) { - kvm_emulator_want_group7_invlpg(); - kvm_init_arch(&svm_arch_ops, THIS_MODULE); - return 0; + return kvm_init_arch(&svm_arch_ops, THIS_MODULE); } static void __exit svm_exit(void) |