---

yaml --- r: 264070 b: refs/heads/master c: b6cf878 h: refs/heads/master v: v3
git-mirror · Sep 20, 2011 · 9dd2c67 · 9dd2c67
1 parent 63876d2
commit 9dd2c67
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 480e5926ce3bb61ec229be2dab08bdce8abb8d2e
+refs/heads/master: b6cf8788a3382c2000743a0e393bcc8aeb0601cb
diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c
@@ -123,6 +123,7 @@ int kvm_dev_ioctl_check_extension(long ext)
 
 	switch (ext) {
 	case KVM_CAP_S390_PSW:
+	case KVM_CAP_S390_GMAP:
 		r = 1;
 		break;
 	default:

diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h
@@ -553,6 +553,7 @@ struct kvm_ppc_pvinfo {
 #define KVM_CAP_SPAPR_TCE 63
 #define KVM_CAP_PPC_SMT 64
 #define KVM_CAP_PPC_RMA	65
+#define KVM_CAP_S390_GMAP 71
 
 #ifdef KVM_CAP_IRQ_ROUTING