From: Konrad Rzeszutek Wilk Date: Wed, 10 Oct 2012 17:30:47 +0000 (-0400) Subject: xen/bootup: allow read_tscp call for Xen PV guests. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd0608e71e9757f4dae35bcfb4e88f4d1a03a8ab;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git xen/bootup: allow read_tscp call for Xen PV guests. The hypervisor will trap it. However without this patch, we would crash as the .read_tscp is set to NULL. This patch fixes it and sets it to the native_read_tscp call. CC: stable@vger.kernel.org Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 70f140447a2..668bbfee0cc 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1164,6 +1164,8 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = { .read_tsc = native_read_tsc, .read_pmc = native_read_pmc, + .read_tscp = native_read_tscp, + .iret = xen_iret, .irq_enable_sysexit = xen_sysexit, #ifdef CONFIG_X86_64