diff options
-rw-r--r-- | include/uapi/linux/kvm.h | 2 | ||||
-rw-r--r-- | virt/kvm/kvm_main.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index cf3a2ff440e4..90d3edab839c 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h | |||
@@ -738,9 +738,7 @@ struct kvm_ppc_smmu_info { | |||
738 | #define KVM_CAP_PPC_GET_SMMU_INFO 78 | 738 | #define KVM_CAP_PPC_GET_SMMU_INFO 78 |
739 | #define KVM_CAP_S390_COW 79 | 739 | #define KVM_CAP_S390_COW 79 |
740 | #define KVM_CAP_PPC_ALLOC_HTAB 80 | 740 | #define KVM_CAP_PPC_ALLOC_HTAB 80 |
741 | #ifdef __KVM_HAVE_READONLY_MEM | ||
742 | #define KVM_CAP_READONLY_MEM 81 | 741 | #define KVM_CAP_READONLY_MEM 81 |
743 | #endif | ||
744 | #define KVM_CAP_IRQFD_RESAMPLE 82 | 742 | #define KVM_CAP_IRQFD_RESAMPLE 82 |
745 | #define KVM_CAP_PPC_BOOKE_WATCHDOG 83 | 743 | #define KVM_CAP_PPC_BOOKE_WATCHDOG 83 |
746 | #define KVM_CAP_PPC_HTAB_FD 84 | 744 | #define KVM_CAP_PPC_HTAB_FD 84 |
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 5a0817ee996e..1d03967def40 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -708,7 +708,7 @@ static int check_memory_region_flags(struct kvm_userspace_memory_region *mem) | |||
708 | { | 708 | { |
709 | u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; | 709 | u32 valid_flags = KVM_MEM_LOG_DIRTY_PAGES; |
710 | 710 | ||
711 | #ifdef KVM_CAP_READONLY_MEM | 711 | #ifdef __KVM_HAVE_READONLY_MEM |
712 | valid_flags |= KVM_MEM_READONLY; | 712 | valid_flags |= KVM_MEM_READONLY; |
713 | #endif | 713 | #endif |
714 | 714 | ||