---

yaml --- r: 357750 b: refs/heads/master c: 2b5e1e4 h: refs/heads/master v: v3
git-mirror · Feb 25, 2013 · a8d5192 · a8d5192
1 parent d7483bc
commit a8d5192
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bef103aa7dd75121f66848d91f6b6179d40c1a71
+refs/heads/master: 2b5e1e474fd7b0f2540a052d15465ba953dd30b1
diff --git a/trunk/arch/arm/include/asm/kvm_host.h b/trunk/arch/arm/include/asm/kvm_host.h
@@ -26,7 +26,7 @@
 #include <asm/kvm_arch_timer.h>
 
 #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS
-#define KVM_MEMORY_SLOTS 32
+#define KVM_USER_MEM_SLOTS 32
 #define KVM_PRIVATE_MEM_SLOTS 4
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 1
 #define KVM_HAVE_ONE_REG