From d15288d993e2b4a08e6d9b6618bfba15eede48d5 Mon Sep 17 00:00:00 2001 From: David Ahern Date: Tue, 8 May 2012 09:28:57 -0600 Subject: [PATCH] --- yaml --- r: 304925 b: refs/heads/master c: 028d455b12719a48b1c4b51ce07a074135726f8f h: refs/heads/master i: 304923: 2c7ce0eff513e14fb082796e8a0066fe8571fc16 v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-record.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9036bc7d0b1d..ce1357219729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04480d01105324dc5b77ca3fbdf85037a7d80dbb +refs/heads/master: 028d455b12719a48b1c4b51ce07a074135726f8f diff --git a/trunk/tools/perf/builtin-record.c b/trunk/tools/perf/builtin-record.c index 42e24149c791..1a9098c697b4 100644 --- a/trunk/tools/perf/builtin-record.c +++ b/trunk/tools/perf/builtin-record.c @@ -242,9 +242,13 @@ static void perf_record__open(struct perf_record *rec) /* * If it's cycles then fall back to hrtimer * based cpu-clock-tick sw counter, which - * is always available even if no PMU support: + * is always available even if no PMU support. + * + * PPC returns ENXIO until 2.6.37 (behavior changed + * with commit b0a873e). */ - if (err == ENOENT && attr->type == PERF_TYPE_HARDWARE + if ((err == ENOENT || err == ENXIO) + && attr->type == PERF_TYPE_HARDWARE && attr->config == PERF_COUNT_HW_CPU_CYCLES) { if (verbose)