summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2012-08-27 12:56:48 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-09-26 15:44:52 +0200
commitbdd1fc27cde35e092497ce8b2ff862bd3e8d27aa (patch)
tree41e1652a29f9f2385c921cd865393667f72aa4e3
parent843c48fd0fc8a63324d1a30255ac2750fa564937 (diff)
downloadop-kernel-dev-bdd1fc27cde35e092497ce8b2ff862bd3e8d27aa.zip
op-kernel-dev-bdd1fc27cde35e092497ce8b2ff862bd3e8d27aa.tar.gz
s390/kvm: Improve Kconfig help text.
CONFIG_S390_GUEST determines whether virtio guest drivers are built, and the virtio console is not enforced as default. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/Kconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 16506b2..443fac9 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -634,16 +634,17 @@ source "arch/s390/kvm/Kconfig"
config S390_GUEST
def_bool y
- prompt "s390 guest support for KVM (EXPERIMENTAL)"
+ prompt "s390 support for virtio devices (EXPERIMENTAL)"
depends on 64BIT && EXPERIMENTAL
select VIRTUALIZATION
select VIRTIO
select VIRTIO_RING
select VIRTIO_CONSOLE
help
+ Enabling this option adds support for virtio based paravirtual device
+ drivers on s390.
+
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.
+ the KVM hypervisor.
endmenu
OpenPOWER on IntegriCloud