From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965862AbbLWXrO (ORCPT ); Wed, 23 Dec 2015 18:47:14 -0500 Received: from mail.kernel.org ([198.145.29.136]:52142 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750710AbbLWXrN (ORCPT ); Wed, 23 Dec 2015 18:47:13 -0500 From: Andy Lutomirski To: x86@kernel.org, Borislav Petkov Cc: linux-kernel@vger.kernel.org, Andy Lutomirski Subject: [PATCH] x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n Date: Wed, 23 Dec 2015 15:47:08 -0800 Message-Id: <60ebbd2ad659a2ab359d69518185bd754ba6042b.1450914384.git.luto@kernel.org> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Andy Lutomirski --- This is for tip:x86/asm. 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..fdcc04020636 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) -- 2.5.0