diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-02-29 10:11:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-02-29 10:11:03 +0800 |
| commit | 12a08707dec7ff067688710aee0d4698f6da98a6 (patch) | |
| tree | f4417dde853c08d86f1394ac6c97e391d336883a /tools/perf | |
| parent | 34f6d2c9d12a97271d55c7b204443b2da9e6c29e (diff) | |
| parent | 2134d97aa3a7ce38bb51f933f2e20cafde371085 (diff) | |
Merge tag 'v4.4.3' into linux-linaro-lsk-v4.4
This is the 4.4.3 stable release
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/parse-events.c | 3 | ||||
| -rw-r--r-- | tools/perf/util/session.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 6fc8cd753e1a..b48e87693aa5 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -399,6 +399,9 @@ static void tracepoint_error(struct parse_events_error *e, int err, { char help[BUFSIZ]; + if (!e) + return; + /* * We get error directly from syscall errno ( > 0), * or from encoded pointer's error ( < 0). diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index c35ffdd360fe..468de95bc8bb 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -972,7 +972,7 @@ static struct machine *machines__find_for_cpumode(struct machines *machines, machine = machines__find(machines, pid); if (!machine) - machine = machines__find(machines, DEFAULT_GUEST_KERNEL_ID); + machine = machines__findnew(machines, DEFAULT_GUEST_KERNEL_ID); return machine; } |