]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xen/bootup: allow read_tscp call for Xen PV guests.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 10 Oct 2012 17:30:47 +0000 (13:30 -0400)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 10 Feb 2014 21:11:12 +0000 (16:11 -0500)
commit cd0608e71e9757f4dae35bcfb4e88f4d1a03a8ab upstream.

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.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
arch/x86/xen/enlighten.c

index 25d787c17ad83fb586b5f5e72c604a08808c4d62..7fa0dc02b9396c6e9cf4e572c39fb7295c840d61 100644 (file)
@@ -952,6 +952,8 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
        .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