diff options
author | David S. Miller <davem@davemloft.net> | 2010-05-31 14:46:45 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-31 14:46:45 +0200 |
commit | 64960848abd18d0bcde3f53ffa7ed0b631e6b25d (patch) | |
tree | 8424a1c550a98ce09f127425fde9b7b5f2f5027a /arch/ia64/kvm/vmm.c | |
parent | net: fix sk_forward_alloc corruptions (diff) | |
parent | Linux 2.6.35-rc1 (diff) | |
download | linux-64960848abd18d0bcde3f53ffa7ed0b631e6b25d.tar.xz linux-64960848abd18d0bcde3f53ffa7ed0b631e6b25d.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/ia64/kvm/vmm.c')
-rw-r--r-- | arch/ia64/kvm/vmm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kvm/vmm.c b/arch/ia64/kvm/vmm.c index 7a62f75778c5..f0b9cac82414 100644 --- 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) |