diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index 4735689dc8eb22549cc6c3bccd0e705677303557..4bd8e8bcc78e15f1d8b67601a26b192d475b6821 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -967,6 +967,8 @@ struct kvm_ppc_resize_hpt {
 #define KVM_CAP_ARM_VM_IPA_SIZE 165 /* returns maximum IPA bits for a VM */
 #define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174
 
+#define KVM_CAP_ARM_CPU_FEATURE 555
+
 #ifdef KVM_CAP_IRQ_ROUTING
 
 struct kvm_irq_routing_irqchip {
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index cd6710630b52d016b12bf25014745ab21393e90c..50fe77632d194cf04ae3b16179a790cc9249e52a 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -218,6 +218,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
 	case KVM_CAP_MP_STATE:
 	case KVM_CAP_IMMEDIATE_EXIT:
 	case KVM_CAP_ARM_IRQ_LINE_LAYOUT_2:
+	case KVM_CAP_ARM_CPU_FEATURE:
 		r = 1;
 		break;
 	case KVM_CAP_ARM_SET_DEVICE_ADDR: