git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
kvm
/
vmm.c
diff --git
a/arch/ia64/kvm/vmm.c
b/arch/ia64/kvm/vmm.c
index 7a62f75778c535f7421fc16ec4525407e3686e9b..f0b9cac824145709c570a3994b2dceaf089b32e3 100644
(file)
--- a/
arch/ia64/kvm/vmm.c
+++ b/
arch/ia64/kvm/vmm.c
@@
-51,7
+51,7
@@
static int __init kvm_vmm_init(void)
vmm_fpswa_interface = fpswa_interface;
/*Register vmm data to kvm side*/
- return kvm_init(&vmm_info, 1024, THIS_MODULE);
+ return kvm_init(&vmm_info, 1024,
0,
THIS_MODULE);
}
static void __exit kvm_vmm_exit(void)