From patchwork Thu Nov 15 05:50:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.yuz, extended, stable] Patch "xen/bootup: allow read_tscp call for Xen PV guests." has been added to staging queue Date: Wed, 14 Nov 2012 19:50:21 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 199182 Message-Id: <1352958621-17717-1-git-send-email-herton.krzesinski@canonical.com> To: Konrad Rzeszutek Wilk Cc: kernel-team@lists.ubuntu.com This is a note to let you know that I have just added a patch titled xen/bootup: allow read_tscp call for Xen PV guests. to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.yuz tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From 2e986cac30ba1afe4e03ba4f2e79556cc7846481 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk 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 Signed-off-by: Herton Ronaldo Krzesinski --- arch/x86/xen/enlighten.c | 2 ++ 1 file changed, 2 insertions(+) -- 1.7.9.5 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 405307f..93dcfdc 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1131,6 +1131,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