Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / arch / s390 / kvm / priv.c

diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index d1faf5c544057f718c3737faf2340dfbaf3914c1..cce40ff2913bbf851059c8ea0f8d604d4eb94304 100644 (file)
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -157,8 +157,8 @@ static int handle_stfl(struct kvm_vcpu *vcpu)
        int rc;
 
        vcpu->stat.instruction_stfl++;
-       facility_list &= ~(1UL<<24); /* no stfle */
-       facility_list &= ~(1UL<<23); /* no large pages */
+       /* only pass the facility bits, which we can handle */
+       facility_list &= 0xfe00fff3;
 
        rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list),
                           &facility_list, sizeof(facility_list));