summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinder@kernel.org>2009-06-11 15:28:09 +0530
committerIngo Molnar <mingo@elte.hu>2009-06-13 12:58:25 +0200
commit4d2be1267fcfb3a4d2198fd696aec5e3dcbce60e (patch)
tree18d01f008ed0ae174539be7a69253a8b93a8384e /arch/x86
parentd5e8da6449d4ef4bac35ea9b9719a2cda02e7b39 (diff)
downloadblackbird-op-linux-4d2be1267fcfb3a4d2198fd696aec5e3dcbce60e.tar.gz
blackbird-op-linux-4d2be1267fcfb3a4d2198fd696aec5e3dcbce60e.zip
perf_counter, x86: Check old-AMD performance monitoring support
AMD supports performance monitoring start from K7 (i.e. family 6), so disable it for earlier AMD CPUs. Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Cc: Robert Richter <robert.richter@amd.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <1244714289.6923.0.camel@ht.satnam> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/perf_counter.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 275bc142cd5d..3c37c3930ca1 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -1459,6 +1459,10 @@ static int intel_pmu_init(void)
static int amd_pmu_init(void)
{
+ /* Performance-monitoring supported from K7 and later: */
+ if (boot_cpu_data.x86 < 6)
+ return -ENODEV;
+
x86_pmu = amd_pmu;
switch (boot_cpu_data.x86) {
OpenPOWER on IntegriCloud