[Xen-changelog] [xen stable-4.6] x86/VPMU: return correct fixed PMC count

[patchbot@xxxxxxx]

commit 57817d09bf6a55604a317b746c0177183ce50c66
Author:     Brendan Gregg <bgregg@xxxxxxxxxxx>
AuthorDate: Tue Dec 15 15:23:54 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Dec 15 15:23:54 2015 +0100

    x86/VPMU: return correct fixed PMC count
    
    Fixes a register typo.
    
    Signed-off-by: Brendan Gregg <bgregg@xxxxxxxxxxx>
    Reviewed-by: Dietmar Hahn <dietmar.hahn@xxxxxxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    master commit: 7d596f5ad70969d8171e1eb5b7a39d0dc6c11dc2
    master date: 2015-11-25 11:12:55 +0100
---
 xen/arch/x86/cpu/vpmu_intel.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c
index 12f80ae..d5ea7fe 100644
--- a/xen/arch/x86/cpu/vpmu_intel.c
+++ b/xen/arch/x86/cpu/vpmu_intel.c
@@ -166,10 +166,9 @@ static int core2_get_arch_pmc_count(void)
  */
 static int core2_get_fixed_pmc_count(void)
 {
-    u32 eax;
+    u32 edx = cpuid_edx(0xa);
 
-    eax = cpuid_eax(0xa);
-    return MASK_EXTR(eax, PMU_FIXED_NR_MASK);
+    return MASK_EXTR(edx, PMU_FIXED_NR_MASK);
 }
 
 /* edx bits 5-12: Bit width of fixed-function performance counters  */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog