diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-15 14:20:07 -0500 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-02-25 04:47:59 -0500 |
| commit | 2b5e1e474fd7b0f2540a052d15465ba953dd30b1 (patch) | |
| tree | ba52a0db398a9ecdb051a9ebbb42d4d82d46b322 /arch/arm/include | |
| parent | bef103aa7dd75121f66848d91f6b6179d40c1a71 (diff) | |
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/arm/include')
| -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 @@ | |||
| 26 | #include <asm/kvm_arch_timer.h> | 26 | #include <asm/kvm_arch_timer.h> |
| 27 | 27 | ||
| 28 | #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS | 28 | #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS |
| 29 | #define KVM_MEMORY_SLOTS 32 | 29 | #define KVM_USER_MEM_SLOTS 32 |
| 30 | #define KVM_PRIVATE_MEM_SLOTS 4 | 30 | #define KVM_PRIVATE_MEM_SLOTS 4 |
| 31 | #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 | 31 | #define KVM_COALESCED_MMIO_PAGE_OFFSET 1 |
| 32 | #define KVM_HAVE_ONE_REG | 32 | #define KVM_HAVE_ONE_REG |