Merge branch 'perf' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core

2010-05-08 10:02:57 +02:00
parent 4d1c52b02d 1cf4a0632c
commit ed82702155
2 changed files with 18 additions and 4 deletions
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -943,7 +943,8 @@ void print_events(void)

 	printf("\n");
 	printf("  %-42s [%s]\n",
-		"rNNN (NNN=<UMASK VALUE><EVENT NUM>)", event_type_descriptors[PERF_TYPE_RAW]);
+		"rNNN (see 'perf list --help' on how to encode it)",
+	       event_type_descriptors[PERF_TYPE_RAW]);
 	printf("\n");

 	printf("  %-42s [%s]\n",