1 files changed, 15 insertions, 1 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 595fb771366e..1df4a1f14289 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -18,6 +18,18 @@ config GENERIC_TIME
         bool
         default y
 
+config CLOCKSOURCE_WATCHDOG
+        bool
+        default y
+
+config GENERIC_CLOCKEVENTS
+        bool
+        default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+        bool
+        default y
+
 config LOCKDEP_SUPPORT
         bool
         default y
@@ -74,6 +86,8 @@ source "init/Kconfig"
 
 menu "Processor type and features"
 
+source "kernel/time/Kconfig"
+
 config SMP
         bool "Symmetric multi-processing support"
         ---help---
@@ -205,7 +219,7 @@ config PARAVIRT
 
 config VMI
         bool "VMI Paravirt-ops support"
-        depends on PARAVIRT
+        depends on PARAVIRT && !NO_HZ
         default y
         help
           VMI provides a paravirtualized interface to multiple hypervisors