Re: [PATCH] x86/vsdo: Fix build on PARAVIRT_CLOCK=y, KVM_GUEST=n

From: Borislav Petkov
Date: Wed Dec 23 2015 - 18:49:40 EST


On Wed, Dec 23, 2015 at 03:47:08PM -0800, Andy Lutomirski wrote:
> Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx>
> ---
>
> 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 <linux/clocksource.h>
> #include <asm/pvclock-abi.h>
>
> -#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 <bp@xxxxxxx>

--
Regards/Gruss,
Boris.

ECO tip #101: Trim your mails when you reply.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/