diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2014-10-02 22:22:54 +0200 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-10-02 22:22:54 +0200 |
| commit | 0c226cbe862216a44597556ab2ada3b69566ec64 (patch) | |
| tree | 5c6fd8352500d9ea731ea929c857fad793ac645d /arch/s390 | |
| parent | af76da6591d9716f687dce16be2948442323c133 (diff) | |
KVM: Give IRQFD its own separate enabling Kconfig option
Currently, the IRQFD code is conditional on CONFIG_HAVE_KVM_IRQ_ROUTING.
So that we can have the IRQFD code compiled in without having the
IRQ routing code, this creates a new CONFIG_HAVE_KVM_IRQFD, makes
the IRQFD code conditional on it instead of CONFIG_HAVE_KVM_IRQ_ROUTING,
and makes all the platforms that currently select HAVE_KVM_IRQ_ROUTING
also select HAVE_KVM_IRQFD.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Tested-by: Eric Auger <eric.auger@linaro.org>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
(cherry picked from commit 297e21053a52f060944e9f0de4c64fad9bcd72fc)
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/Kconfig | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig deleted file mode 100644 index 70b46eacf8e1..000000000000 --- a/arch/s390/kvm/Kconfig +++ /dev/null @@ -1,52 +0,0 @@ -# -# KVM configuration -# -source "virt/kvm/Kconfig" - -menuconfig VIRTUALIZATION - def_bool y - prompt "KVM" - ---help--- - Say Y here to get to see options for using your Linux host to run other - operating systems inside virtual machines (guests). - This option alone does not add any kernel code. - - If you say N, all options in this submenu will be skipped and disabled. - -if VIRTUALIZATION - -config KVM - def_tristate y - prompt "Kernel-based Virtual Machine (KVM) support" - depends on HAVE_KVM - select PREEMPT_NOTIFIERS - select ANON_INODES - select HAVE_KVM_CPU_RELAX_INTERCEPT - select HAVE_KVM_EVENTFD - ---help--- - Support hosting paravirtualized guest machines using the SIE - virtualization capability on the mainframe. This should work - on any 64bit machine. - - This module provides access to the hardware capabilities through - a character device node named /dev/kvm. - - To compile this as a module, choose M here: the module - will be called kvm. - - If unsure, say N. - -config KVM_S390_UCONTROL - bool "Userspace controlled virtual machines" - depends on KVM - ---help--- - Allow CAP_SYS_ADMIN users to create KVM virtual machines that are - controlled by userspace. - - If unsure, say N. - -# OK, it's a little counter-intuitive to do this, but it puts it neatly under -# the virtualization menu. -source drivers/vhost/Kconfig - -endif # VIRTUALIZATION |