Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45236
b: refs/heads/master
c: e097f35
h: refs/heads/master
v: v3
  • Loading branch information
Yoshimi Ichiyanagi authored and Linus Torvalds committed Jan 6, 2007
1 parent 8b79313 commit df10666
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d3b2c33860d4acdfe3ac29b40b03e655eb8d1e2c
refs/heads/master: e097f35ce58eb8d687f3a300247cf1a978fcea39
8 changes: 4 additions & 4 deletions trunk/drivers/kvm/kvm_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1944,17 +1944,17 @@ int kvm_init_arch(struct kvm_arch_ops *ops, struct module *module)
return -EEXIST;
}

kvm_arch_ops = ops;

if (!kvm_arch_ops->cpu_has_kvm_support()) {
if (!ops->cpu_has_kvm_support()) {
printk(KERN_ERR "kvm: no hardware support\n");
return -EOPNOTSUPP;
}
if (kvm_arch_ops->disabled_by_bios()) {
if (ops->disabled_by_bios()) {
printk(KERN_ERR "kvm: disabled by bios\n");
return -EOPNOTSUPP;
}

kvm_arch_ops = ops;

r = kvm_arch_ops->hardware_setup();
if (r < 0)
return r;
Expand Down

0 comments on commit df10666

Please sign in to comment.