[tip:perf/core] perf, x86: Small fix to cpuid10_edx
in [Kernel]
|
Prev: [tip:x86/uv] x86, UV: Correct BAU software acknowledge
Next: [tip:x86/uv] x86, UV: Correct BAU regular message type
From: tip-bot for Livio Soares on 8 Jun 2010 17:00 Commit-ID: e768aee89c687a50e6a2110e30c5cae1fbf0d2da Gitweb: http://git.kernel.org/tip/e768aee89c687a50e6a2110e30c5cae1fbf0d2da Author: Livio Soares <livio(a)eecg.toronto.edu> AuthorDate: Thu, 3 Jun 2010 15:00:31 -0400 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Tue, 8 Jun 2010 20:27:04 +0200 perf, x86: Small fix to cpuid10_edx Fixes to 'cpuid10_edx' to comply with Intel documentation. According to the Intel Manual, Volume 2A, Table 3-12, the cpuid for architecture performance monitoring returns, in EDX, two pieces of information: 1) Number of fixed-function counters (5 bits, not 4) 2) Width of fixed-function counters (8 bits) Signed-off-by: Livio Soares <livio(a)eecg.toronto.edu> Acked-by: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Cc: Arnaldo Carvalho de Melo <acme(a)redhat.com> Cc: Arjan van de Ven <arjan(a)linux.intel.com> Cc: "H. Peter Anvin" <hpa(a)zytor.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/include/asm/perf_event.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 254883d..6ed3ae4 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -68,8 +68,9 @@ union cpuid10_eax { union cpuid10_edx { struct { - unsigned int num_counters_fixed:4; - unsigned int reserved:28; + unsigned int num_counters_fixed:5; + unsigned int bit_width_fixed:8; + unsigned int reserved:19; } split; unsigned int full; }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |