]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS
authorMarc Zyngier <marc.zyngier@arm.com>
Fri, 15 Feb 2013 19:20:07 +0000 (19:20 +0000)
committerGleb Natapov <gleb@redhat.com>
Mon, 25 Feb 2013 09:47:59 +0000 (11:47 +0200)
Commit bbacc0c (KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS)
broke KVM/ARM by changing a global #define.

Apply the same change to fix the compilation breakage.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
arch/arm/include/asm/kvm_host.h

index dfe98866a992c3aac424ea196eec4ac6789411b6..d1736a53b12d423560e402adc373d79e834f782f 100644 (file)
@@ -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