Merge commit 'v2.6.33' into perf/core

[net-next-2.6.git] / tools / perf / util / probe-event.c

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 71b0dd590a374320386b71e6d49f67bcd05c77a0..a21b6bf055acbad42df02e678a47a0be82cf293d 100644 (file)
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -310,6 +310,7 @@ int synthesize_perf_probe_point(struct probe_point *pp)
        int ret;
 
        pp->probes[0] = buf = zalloc(MAX_CMDLEN);
+       pp->found = 1;
        if (!buf)
                die("Failed to allocate memory by zalloc.");
        if (pp->offset) {
@@ -332,6 +333,7 @@ int synthesize_perf_probe_point(struct probe_point *pp)
 error:
                free(pp->probes[0]);
                pp->probes[0] = NULL;
+               pp->found = 0;
        }
        return ret;
 }
@@ -494,6 +496,7 @@ void show_perf_probe_events(void)
        struct str_node *ent;
 
        setup_pager();
+       memset(&pp, 0, sizeof(pp));
 
        fd = open_kprobe_events(O_RDONLY, 0);
        rawlist = get_trace_kprobe_event_rawlist(fd);