From d262014e260ed4f6ec4e5465f63e0b800c0a938b Mon Sep 17 00:00:00 2001
From: Carsten Otte <cotte@de.ibm.com>
Date: Tue, 15 May 2012 14:15:27 +0200
Subject: [PATCH] --- yaml --- r: 307911 b: refs/heads/master c:
 29b7c71b5ecf2caaa4c2105ecc0094826db8a8a8 h: refs/heads/master i:   307909:
 180310efe2190749416a04b37cf1ae0292a8f032   307907:
 534052414e83ce9adb94883fbc066b03f567702c   307903:
 f566fa002d3f5f793371b2610feca928740b5094 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/s390/include/asm/kvm.h |  3 +++
 trunk/arch/s390/kvm/kvm-s390.c    | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 39d0c0267876..f81efb7223c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14eebd917d154f3181d2cb219e40b18eec314db7
+refs/heads/master: 29b7c71b5ecf2caaa4c2105ecc0094826db8a8a8
diff --git a/trunk/arch/s390/include/asm/kvm.h b/trunk/arch/s390/include/asm/kvm.h
index 96076676e224..53a53720830a 100644
--- a/trunk/arch/s390/include/asm/kvm.h
+++ b/trunk/arch/s390/include/asm/kvm.h
@@ -52,4 +52,7 @@ struct kvm_sync_regs {
 	__u32 acrs[16];	/* access registers */
 	__u64 crs[16];	/* control registers */
 };
+
+#define KVM_REG_S390_TODPR	(KVM_REG_S390 | KVM_REG_SIZE_U32 | 0x1)
+#define KVM_REG_S390_EPOCHDIFF	(KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x2)
 #endif
diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c
index 894b3e47b8c1..cc4c01322ce4 100644
--- a/trunk/arch/s390/kvm/kvm-s390.c
+++ b/trunk/arch/s390/kvm/kvm-s390.c
@@ -446,6 +446,14 @@ static int kvm_arch_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu,
 	int r = -EINVAL;
 
 	switch (reg->id) {
+	case KVM_REG_S390_TODPR:
+		r = put_user(vcpu->arch.sie_block->todpr,
+			     (u32 __user *)reg->addr);
+		break;
+	case KVM_REG_S390_EPOCHDIFF:
+		r = put_user(vcpu->arch.sie_block->epoch,
+			     (u64 __user *)reg->addr);
+		break;
 	default:
 		break;
 	}
@@ -459,6 +467,14 @@ static int kvm_arch_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu,
 	int r = -EINVAL;
 
 	switch (reg->id) {
+	case KVM_REG_S390_TODPR:
+		r = get_user(vcpu->arch.sie_block->todpr,
+			     (u32 __user *)reg->addr);
+		break;
+	case KVM_REG_S390_EPOCHDIFF:
+		r = get_user(vcpu->arch.sie_block->epoch,
+			     (u64 __user *)reg->addr);
+		break;
 	default:
 		break;
 	}