diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-09 10:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-09 10:44:27 -0400 |
| commit | e710574de10b181c159a67af75af0245de33a4b9 (patch) | |
| tree | 292aeb4ab31d7e954c146b8b00829c67501fd0d6 /tools/perf/util/probe-event.c | |
| parent | a34668f6beb4ab01e07683276d6a24bab6c175e0 (diff) | |
| parent | 9941c96ad869d10f7e34e03990ce450ab8fcb83d (diff) | |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'tools/perf/util/probe-event.c')
| -rw-r--r-- | tools/perf/util/probe-event.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index b82d54fa2c56..1c7bfa5fe0a8 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c | |||
| @@ -1820,11 +1820,15 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev, | |||
| 1820 | ret = -ENOMEM; | 1820 | ret = -ENOMEM; |
| 1821 | goto error; | 1821 | goto error; |
| 1822 | } | 1822 | } |
| 1823 | tev->point.module = strdup(module); | 1823 | |
| 1824 | if (tev->point.module == NULL) { | 1824 | if (module) { |
| 1825 | ret = -ENOMEM; | 1825 | tev->point.module = strdup(module); |
| 1826 | goto error; | 1826 | if (tev->point.module == NULL) { |
| 1827 | ret = -ENOMEM; | ||
| 1828 | goto error; | ||
| 1829 | } | ||
| 1827 | } | 1830 | } |
| 1831 | |||
| 1828 | tev->point.offset = pev->point.offset; | 1832 | tev->point.offset = pev->point.offset; |
| 1829 | tev->point.retprobe = pev->point.retprobe; | 1833 | tev->point.retprobe = pev->point.retprobe; |
| 1830 | tev->nargs = pev->nargs; | 1834 | tev->nargs = pev->nargs; |