aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/kvm/kvm-s390.c3
-rw-r--r--include/linux/kvm.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index abf784d8c680..a1061b361c43 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -129,6 +129,9 @@ int kvm_dev_ioctl_check_extension(long ext)
129 case KVM_CAP_S390_PSW: 129 case KVM_CAP_S390_PSW:
130 case KVM_CAP_S390_GMAP: 130 case KVM_CAP_S390_GMAP:
131 case KVM_CAP_SYNC_MMU: 131 case KVM_CAP_SYNC_MMU:
132#ifdef CONFIG_KVM_S390_UCONTROL
133 case KVM_CAP_S390_UCONTROL:
134#endif
132 r = 1; 135 r = 1;
133 break; 136 break;
134 default: 137 default:
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 778e748927b4..6cf048d9604b 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -569,6 +569,7 @@ struct kvm_ppc_pvinfo {
569#define KVM_CAP_PPC_PAPR 68 569#define KVM_CAP_PPC_PAPR 68
570#define KVM_CAP_S390_GMAP 71 570#define KVM_CAP_S390_GMAP 71
571#define KVM_CAP_TSC_DEADLINE_TIMER 72 571#define KVM_CAP_TSC_DEADLINE_TIMER 72
572#define KVM_CAP_S390_UCONTROL 73
572 573
573#ifdef KVM_CAP_IRQ_ROUTING 574#ifdef KVM_CAP_IRQ_ROUTING
574 575