From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965885AbbLWXth (ORCPT ); Wed, 23 Dec 2015 18:49:37 -0500 Received: from mail.skyhub.de ([78.46.96.112]:57319 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753290AbbLWXtg (ORCPT ); Wed, 23 Dec 2015 18:49:36 -0500 Date: Thu, 24 Dec 2015 00:49:31 +0100 From: Borislav Petkov To: Andy Lutomirski Cc: x86@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n Message-ID: <20151223234931.GJ30213@pd.tnic> References: <60ebbd2ad659a2ab359d69518185bd754ba6042b.1450914384.git.luto@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <60ebbd2ad659a2ab359d69518185bd754ba6042b.1450914384.git.luto@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 23, 2015 at 03:47:08PM -0800, Andy Lutomirski wrote: > 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 Acked-by: Borislav Petkov -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply.