Merge branch 'sh/nommu' into sh-latest

1 files changed, 3 insertions, 0 deletions

diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index ff5790d8e99..1a7fe868f37 100644
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -35,6 +35,7 @@ config KVM
         select KVM_MMIO
         select TASKSTATS
         select TASK_DELAY_ACCT
+        select PERF_EVENTS
         ---help---
           Support hosting fully virtualized guest machines using hardware
           virtualization extensions.  You will need a fairly recent
@@ -52,6 +53,8 @@ config KVM
 config KVM_INTEL
         tristate "KVM for Intel processors support"
         depends on KVM
+        # for perf_guest_get_msrs():
+        depends on CPU_SUP_INTEL
         ---help---
           Provides support for KVM on Intel processors equipped with the VT
           extensions.