projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[linux-2.6-block.git]
/
arch
/
x86
/
kvm
/
x86.c
diff --git
a/arch/x86/kvm/x86.c
b/arch/x86/kvm/x86.c
index ca3d760dd5817f45ab6ea87a33fa075105095e2d..8f1e22d3b286ccf03c90dc3bc28f120fe27a244b 100644
(file)
--- a/
arch/x86/kvm/x86.c
+++ b/
arch/x86/kvm/x86.c
@@
-2636,7
+2636,7
@@
out:
return r;
}
-int kvm_
dev_ioctl_check_extension(
long ext)
+int kvm_
vm_ioctl_check_extension(struct kvm *kvm,
long ext)
{
int r;