| From 9ce9d3c015b005cbfdba577787ae3a023d9e0cd6 Mon Sep 17 00:00:00 2001 |
| From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
| Date: Wed, 10 Oct 2012 13:30:47 -0400 |
| Subject: [PATCH] xen/bootup: allow read_tscp call for Xen PV guests. |
| |
| 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 | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c |
| index 25d787c17ad8..7fa0dc02b939 100644 |
| --- a/arch/x86/xen/enlighten.c |
| +++ b/arch/x86/xen/enlighten.c |
| @@ -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 |
| -- |
| 1.8.5.2 |
| |
