The following commit has been merged in the linux branch: commit 63c9e01e1a0dcecc982137d527d44b5ac808b607 Author: Ashwin Chaugule ashwinc@quicinc.com Date: Sun Oct 4 15:49:34 2009 -0700

perf tools: Remove static debugfs path from parse-events

Timechart doesn't work if debugfs is not in /sys/kernel/debug/. Fixed by using global debugfs_path which is filled in by perf.

Signed-off-by: Ashwin Chaugule ashwinc@quicinc.com Cc: "Arjan van de Ven" arjan@linux.intel.com LKML-Reference: a751bdc6978478de6d10440e587a2cc7.squirrel@www.codeaurora.org Signed-off-by: Ingo Molnar mingo@elte.hu

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 87c424d..8cfb48c 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -691,7 +691,10 @@ static void store_event_type(const char *orgname) FILE *file; int id;

- sprintf(filename, "/sys/kernel/debug/tracing/events/%s/id", orgname); + sprintf(filename, "%s/", debugfs_path); + strncat(filename, orgname, strlen(orgname)); + strcat(filename, "/id"); + c = strchr(filename, ':'); if (c) *c = '/';