Merge branch 'linus' into tracing/ftrace

1 files changed, 5 insertions, 0 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b0937c03af3c..400135148555 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -385,6 +385,7 @@ config VMI
 config KVM_CLOCK
         bool "KVM paravirtualized clock"
         select PARAVIRT
+        select PARAVIRT_CLOCK
         depends on !(X86_VISWS || X86_VOYAGER)
         help
           Turning on this option will allow you to run a paravirtualized clock
@@ -412,6 +413,10 @@ config PARAVIRT
           over full virtualization.  However, when run without a hypervisor
           the kernel is theoretically slower and slightly larger.
 
+config PARAVIRT_CLOCK
+        bool
+        default n
+
 endif
 
 config MEMTEST_BOOTPARAM