---

yaml --- r: 304925 b: refs/heads/master c: 028d455 h: refs/heads/master i: 304923: 2c7ce0e v: v3
git-mirror · May 9, 2012 · d15288d · d15288d
1 parent f2a7e1f
commit d15288d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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)