From 3087cec0f1b98a70acbaa47c3fc3701747db00e8 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 16 Feb 2007 01:27:23 -0800
Subject: [PATCH] --- yaml --- r: 48556 b: refs/heads/master c:
 b463fc60730bea6cdd73fec6edc6ec4658d47d37 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/arch/i386/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b4d18ddc03e7..5043a491b628 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6025a79f5d438bba0186fbb230dc780e876edf2
+refs/heads/master: b463fc60730bea6cdd73fec6edc6ec4658d47d37
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index 595fb771366e..4ea31c327d1f 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -205,7 +205,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