2 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index fec607537fa3..32fdc45ca35e 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -270,7 +270,7 @@ struct kvm_memory_slot {
         struct kvm_arch_memory_slot arch;
         unsigned long userspace_addr;
         u32 flags;
-        int id;
+        short id;
         bool user_alloc;
 };
 
@@ -330,7 +330,7 @@ struct kvm_memslots {
         u64 generation;
         struct kvm_memory_slot memslots[KVM_MEM_SLOTS_NUM];
         /* The mapping table from slot id to the index in memslots[]. */
-        int id_to_index[KVM_MEM_SLOTS_NUM];
+        short id_to_index[KVM_MEM_SLOTS_NUM];
 };
 
 struct kvm {
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 42c1eb73a0e3..bd31096e3698 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -474,6 +474,8 @@ static struct kvm *kvm_create_vm(unsigned long type)
         INIT_HLIST_HEAD(&kvm->irq_ack_notifier_list);
 #endif
 
+        BUILD_BUG_ON(KVM_MEM_SLOTS_NUM > SHRT_MAX);
+
         r = -ENOMEM;
         kvm->memslots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
         if (!kvm->memslots)