From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Mon, 25 Oct 2010 14:10:48 +0000 (+0200)
Subject: [S390] kvm: Enable z196 instruction facilities
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=6d00d00bf23b86b352e2d075cfe751acd1908278;p=deliverable%2Flinux.git

[S390] kvm: Enable z196 instruction facilities

Enable PFPO, floating point extension, distinct-operands,
fast-BCR-serialization, high-word, interlocked-access, load/store-
on-condition, and population-count facilities for guests.
(bits 37, 44 and 45).

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 4fe68650535c..76482b65ba3e 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -741,7 +741,7 @@ static int __init kvm_s390_init(void)
 		return -ENOMEM;
 	}
 	stfle(facilities, 1);
-	facilities[0] &= 0xff00fff3f0700000ULL;
+	facilities[0] &= 0xff00fff3f47c0000ULL;
 	return 0;
 }