diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 21:22:15 +0900 |
commit | bff7b55bdb325f62c4e30a97883ebd2b536bd47b (patch) | |
tree | de4ab64ec0837ae308e17312b553e9a5209b6f62 /tools/perf/util | |
parent | e7fad451f06e21e74b6051c5ad4917e37460be3a (diff) | |
parent | 44b7532b8b464f606053562400719c9c21276037 (diff) | |
download | linux-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.tar.gz linux-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.tar.bz2 linux-bff7b55bdb325f62c4e30a97883ebd2b536bd47b.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/parse-events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 9d5f1ca50e6f..5a72586e1df0 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -75,7 +75,7 @@ static char *sw_event_names[] = { #define MAX_ALIASES 8 static char *hw_cache [][MAX_ALIASES] = { - { "L1-data" , "l1-d", "l1d", "l1" }, + { "L1-data" , "l1-d", "l1d" }, { "L1-instruction" , "l1-i", "l1i" }, { "L2" , "l2" }, { "Data-TLB" , "dtlb", "d-tlb" }, |