From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752251AbcAFJzS (ORCPT ); Wed, 6 Jan 2016 04:55:18 -0500 Received: from terminus.zytor.com ([198.137.202.10]:48918 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751985AbcAFJzO (ORCPT ); Wed, 6 Jan 2016 04:55:14 -0500 Date: Wed, 6 Jan 2016 01:54:40 -0800 From: tip-bot for Andy Lutomirski Message-ID: Cc: tglx@linutronix.de, oleg@redhat.com, bp@alien8.de, keescook@chromium.org, luto@kernel.org, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, keescook@chromium.org, tglx@linutronix.de, oleg@redhat.com, bp@alien8.de, hpa@zytor.com, luto@kernel.org In-Reply-To: <444d38a9bcba832685740ea1401b569861d09a72.1451446564.git.luto@kernel.org> References: <444d38a9bcba832685740ea1401b569861d09a72.1451446564.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST= n Git-Commit-ID: 8705d603edd49f1cff165cd3b7998f4c7f098d27 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 8705d603edd49f1cff165cd3b7998f4c7f098d27 Gitweb: http://git.kernel.org/tip/8705d603edd49f1cff165cd3b7998f4c7f098d27 Author: Andy Lutomirski AuthorDate: Tue, 29 Dec 2015 20:12:18 -0800 Committer: Thomas Gleixner CommitDate: Wed, 6 Jan 2016 10:49:53 +0100 x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n arch/x86/built-in.o: In function `arch_setup_additional_pages': (.text+0x587): undefined reference to `pvclock_pvti_cpu0_va' KVM_GUEST selects PARAVIRT_CLOCK, so we can make pvclock_pvti_cpu0_va depend on KVM_GUEST. Signed-off-by: Andy Lutomirski Tested-by: Borislav Petkov Cc: Oleg Nesterov Cc: Kees Cook Link: http://lkml.kernel.org/r/444d38a9bcba832685740ea1401b569861d09a72.1451446564.git.luto@kernel.org Signed-off-by: Thomas Gleixner --- 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 66df22b..fdcc040 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 +#ifdef 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)