From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: [PATCH] x86: don't allow KVM_CLOCK without HAVE_KVM Date: Fri, 14 Mar 2008 10:44:44 -0700 Message-ID: <20080314104444.ca80e434.randy.dunlap@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel@lists.sourceforge.net, mingo , avi@qumranet.com, hpa To: lkml , linux-next@vger.kernel.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org From: Randy Dunlap Make KVM_CLOCK depend on HAVE_KVM. Otherwise a Voyager build can fail with: CC arch/x86/kernel/asm-offsets.s In file included from include2/asm/irqflags.h:59, from /local/linsrc/next-20080314/include/linux/irqflags.h:46, from include2/asm/system.h:11, from include2/asm/processor.h:21, from include2/asm/atomic_32.h:5, from include2/asm/atomic.h:2, from /local/linsrc/next-20080314/include/linux/crypto.h:20, from /local/linsrc/next-20080314/arch/x86/kernel/asm-offsets_32.c:7, from /local/linsrc/next-20080314/arch/x86/kernel/asm-offsets.c:2: include2/asm/paravirt.h: In function 'startup_ipi_hook': include2/asm/paravirt.h:856: error: 'struct pv_apic_ops' has no member named 'startup_ipi_hook' include2/asm/paravirt.h:856: error: 'struct pv_apic_ops' has no member named 'startup_ipi_hook' include2/asm/paravirt.h:856: error: memory input 4 is not directly addressable make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[1]: *** [prepare0] Error 2 make: *** [sub-make] Error 2 Signed-off-by: Randy Dunlap --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) --- next-20080314.orig/arch/x86/Kconfig +++ next-20080314/arch/x86/Kconfig @@ -370,6 +370,7 @@ config VMI config KVM_CLOCK bool "KVM paravirtualized clock" select PARAVIRT + depends on HAVE_KVM help Turning on this option will allow you to run a paravirtualized clock when running over the KVM hypervisor. Instead of relying on a PIT ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/