summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2008-07-25 15:50:04 +0200
committerAvi Kivity <avi@qumranet.com>2008-07-27 11:35:47 +0300
commit99e65c92f2bbf84f43766a8bf701e36817d62822 (patch)
treec7ad277189ab20fbb1041fba994099abbd96bc41 /drivers/s390
parent2bd0ac4eb469ef58c3b1746fccd15da871fc55c4 (diff)
downloadop-kernel-dev-99e65c92f2bbf84f43766a8bf701e36817d62822.zip
op-kernel-dev-99e65c92f2bbf84f43766a8bf701e36817d62822.tar.gz
KVM: s390: Fix guest kconfig
Cornelia Huck noticed that a modular virtio without kvm guest support leads to a build error in the s390 virtio transport: CONFIG_VIRTIO=m leads to ERROR: "vmem_add_mapping" [drivers/s390/kvm/kvm_virtio.ko] undefined! ERROR: "max_pfn" [drivers/s390/kvm/kvm_virtio.ko] undefined! ERROR: "vmem_remove_mapping" [drivers/s390/kvm/kvm_virtio.ko] undefined! The virtio transport only works with kvm guest support and only as a builtin. Lets change the build process of drivers/s390/kvm/kvm_virtio.c to depend on kvm guest support, which is also a bool. CONFIG_S390_GUEST already selects CONFIG_VIRTIO, that should prevent CONFIG_S390_GUEST=y CONFIG_VIRTIO=n situations. CC: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/kvm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/kvm/Makefile b/drivers/s390/kvm/Makefile
index 4a5ec39..0815690 100644
--- a/drivers/s390/kvm/Makefile
+++ b/drivers/s390/kvm/Makefile
@@ -6,4 +6,4 @@
# it under the terms of the GNU General Public License (version 2 only)
# as published by the Free Software Foundation.
-obj-$(CONFIG_VIRTIO) += kvm_virtio.o
+obj-$(CONFIG_S390_GUEST) += kvm_virtio.o
OpenPOWER on IntegriCloud