diff options
author | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
tree | e48942a05882da47544e179c6a0c920e00137a6a /arch/x86/kvm/Kconfig | |
parent | 8ed814602876bec9bad2649ca17f34b499357a1c (diff) | |
parent | d8ec26d7f8287f5788a494f56e8814210f0e64be (diff) | |
download | linux-stable-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.gz linux-stable-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.bz2 linux-stable-41be702a542a0d14bb0b1c16e824fa9ed27616ec.zip |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'arch/x86/kvm/Kconfig')
-rw-r--r-- | arch/x86/kvm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index a47a3e54b964..b89c5db2b832 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -38,6 +38,7 @@ config KVM select PERF_EVENTS select HAVE_KVM_MSI select HAVE_KVM_CPU_RELAX_INTERCEPT + select KVM_VFIO ---help--- Support hosting fully virtualized guest machines using hardware virtualization extensions. You will need a fairly recent |