diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-15 19:20:07 +0000 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-02-25 11:47:59 +0200 |
| commit | 2b5e1e474fd7b0f2540a052d15465ba953dd30b1 (patch) | |
| tree | ba52a0db398a9ecdb051a9ebbb42d4d82d46b322 /arch | |
| parent | bef103aa7dd75121f66848d91f6b6179d40c1a71 (diff) | |
| download | linux-2b5e1e474fd7b0f2540a052d15465ba953dd30b1.tar.bz2 | |
ARM: KVM: Rename KVM_MEMORY_SLOTS -> KVM_USER_MEM_SLOTS
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/kvm_host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index dfe98866a992..d1736a53b12d 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/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 |