From b463fc60730bea6cdd73fec6edc6ec4658d47d37 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 16 Feb 2007 01:27:23 -0800
Subject: [PATCH] [PATCH] vmi-versus-hrtimers

arch/i386/kernel/built-in.o: In function `vmi_stop_hz_timer':
: undefined reference to `next_timer_interrupt'

If CONFIG_NO_HZ, next_timer_interrupt() doesn't exist (and presumably doesn't
make sense).

Perhaps VMI shouildn't be playing with timer internals at this level.

Cc: Zachary Amsden <zach@vmware.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
 arch/i386/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 595fb771366e..4ea31c327d1f 100644
--- a/arch/i386/Kconfig
+++ b/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
-- 
2.20.1