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

1 files changed, 4 insertions, 2 deletions

diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index 310ce897229c..66f1980e3855 100644
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -18,7 +18,8 @@ static inline int is_c_varname(const char *name)
 #ifdef DWARF_SUPPORT
 /* Find kprobe_trace_events specified by perf_probe_event from debuginfo */
 extern int find_kprobe_trace_events(int fd, struct perf_probe_event *pev,
-                                    struct kprobe_trace_event **tevs);
+                                    struct kprobe_trace_event **tevs,
+                                    int max_tevs);
 
 /* Find a perf_probe_point from debuginfo */
 extern int find_perf_probe_point(int fd, unsigned long addr,
@@ -32,7 +33,8 @@ extern int find_line_range(int fd, struct line_range *lr);
 struct probe_finder {
         struct perf_probe_event *pev;           /* Target probe event */
         struct kprobe_trace_event *tevs;        /* Result trace events */
-        int                     ntevs;          /* number of trace events */
+        int                     ntevs;          /* Number of trace events */
+        int                     max_tevs;       /* Max number of trace events */
 
         /* For function searching */
         int                     lno;            /* Line number */