2 files changed, 7 insertions, 4 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4c03049e7db9..bc581d8a7cd9 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -565,13 +565,16 @@ config ZFCPDUMP
           Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
 
 config S390_GUEST
-bool "s390 guest support (EXPERIMENTAL)"
+bool "s390 guest support for KVM (EXPERIMENTAL)"
         depends on 64BIT && EXPERIMENTAL
         select VIRTIO
         select VIRTIO_RING
         select VIRTIO_CONSOLE
         help
-          Select this option if you want to run the kernel under s390 linux
+          Select this option if you want to run the kernel as a guest under
+          the KVM hypervisor. This will add detection for KVM as well  as a
+          virtio transport. If KVM is detected, the virtio console will be
+          the default console.
 endmenu
 
 source "net/Kconfig"
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index d1faf5c54405..cce40ff2913b 100644
--- 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));