diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-10-10 13:30:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-21 09:17:10 -0700 |
| commit | d62c80f1f9146816e91921ded8f982cfc3491f4d (patch) | |
| tree | d216a76de6e94372caa3aedf893fc2ff62b8e275 | |
| parent | 57bbd13f0b70c424ae4053d0ab7262fe9ff88ab8 (diff) | |
| download | kernel_samsung_smdk4412-d62c80f1f9146816e91921ded8f982cfc3491f4d.tar.gz kernel_samsung_smdk4412-d62c80f1f9146816e91921ded8f982cfc3491f4d.tar.bz2 kernel_samsung_smdk4412-d62c80f1f9146816e91921ded8f982cfc3491f4d.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/xen/enlighten.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 185a0d6349c..9f808afe0d1 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -989,6 +989,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 |