From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755364AbbLVSu4 (ORCPT ); Tue, 22 Dec 2015 13:50:56 -0500 Received: from mail.skyhub.de ([78.46.96.112]:55393 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754243AbbLVSuy (ORCPT ); Tue, 22 Dec 2015 13:50:54 -0500 From: Borislav Petkov To: Andy Lutomirski Cc: X86 ML , LKML Subject: [PATCH] x86/vdso: Fix build when CONFIG_KVM_GUEST is not set Date: Tue, 22 Dec 2015 19:50:51 +0100 Message-Id: <1450810251-19120-1-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Doing randbuilds fails like this here at link time: arch/x86/built-in.o: In function `arch_setup_additional_pages': /home/boris/kernel/linux/arch/x86/entry/vdso/vma.c:174: undefined reference to `pvclock_pvti_cpu0_va' make: *** [vmlinux] Error 1 This is because pvclock_pvti_cpu0_va() is defined in arch/x86/kernel/kvmclock.c as an accessor to the private hv_clock thing but if CONFIG_KVM_GUEST is not set, we don't have that function to link to. So add CONFIG_KVM_GUEST to the ifdeffery. Signed-off-by: Borislav Petkov --- arch/x86/include/asm/pvclock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h index 66df22b2e0c9..1af6bee77fb0 100644 --- a/arch/x86/include/asm/pvclock.h +++ b/arch/x86/include/asm/pvclock.h @@ -4,7 +4,7 @@ #include #include -#ifdef CONFIG_PARAVIRT_CLOCK +#if defined(CONFIG_PARAVIRT_CLOCK) && defined(CONFIG_KVM_GUEST) extern struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void); #else static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void) -- 2.3.5