From: Andrew Morton <akpm@osdl.org>
Date: Fri, 16 Feb 2007 09:27:23 +0000 (-0800)
Subject: [PATCH] vmi-versus-hrtimers
X-Git-Tag: v2.6.21-rc1~164
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b463fc60730bea6cdd73fec6edc6ec4658d47d37;p=linux-2.6

[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>
---

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 595fb77136..4ea31c327d 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