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

1 files changed, 4 insertions, 1 deletions

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index d2fc46103f83..d75084bccdb7 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -937,7 +937,8 @@ static struct perf_event_ops event_ops = {
 
 static int __cmd_timechart(void)
 {
-        struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0, false);
+        struct perf_session *session = perf_session__new(input_name, O_RDONLY,
+                                                         0, false, &event_ops);
         int ret = -EINVAL;
 
         if (session == NULL)
@@ -1021,6 +1022,8 @@ static const struct option options[] = {
         OPT_CALLBACK('p', "process", NULL, "process",
                       "process selector. Pass a pid or process name.",
                        parse_process),
+        OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
+                    "Look for files with symbols relative to this directory"),
         OPT_END()
 };