From 64bf09dbe8d7ba688ff69d50a3625802c8a71e99 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Mon, 27 Aug 2012 12:56:48 +0200 Subject: [PATCH] --- yaml --- r: 324053 b: refs/heads/master c: bdd1fc27cde35e092497ce8b2ff862bd3e8d27aa h: refs/heads/master i: 324051: f8eaf6e719777cf8c423d2477fd60cca875c3a43 v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd6410c846a8..83a8983a5a39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 843c48fd0fc8a63324d1a30255ac2750fa564937 +refs/heads/master: bdd1fc27cde35e092497ce8b2ff862bd3e8d27aa diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index 16506b28cb72..443fac9f1649 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/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