From: tip-bot for He Kuang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, a.p.zijlstra@chello.nl, acme@redhat.com,
hpa@zytor.com, hekuang@huawei.com, mingo@kernel.org,
wangnan0@huawei.com, jolsa@kernel.org,
linux-kernel@vger.kernel.org
Subject: [tip:perf/core] perf trace: Removed duplicated NULL test
Date: Thu, 14 May 2015 23:43:37 -0700 [thread overview]
Message-ID: <tip-ff8f695c0ec9d73d8a9f92fe634d6476ad74e3a1@git.kernel.org> (raw)
In-Reply-To: <1431347316-30401-2-git-send-email-hekuang@huawei.com>
Commit-ID: ff8f695c0ec9d73d8a9f92fe634d6476ad74e3a1
Gitweb: http://git.kernel.org/tip/ff8f695c0ec9d73d8a9f92fe634d6476ad74e3a1
Author: He Kuang <hekuang@huawei.com>
AuthorDate: Mon, 11 May 2015 12:28:36 +0000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 12 May 2015 09:59:49 -0300
perf trace: Removed duplicated NULL test
No need to test trace.evlist against NULL twice.
Signed-off-by: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1431347316-30401-2-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-trace.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index cbfdb95..96a2eba 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2721,11 +2721,10 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
signal(SIGFPE, sighandler_dump_stack);
trace.evlist = perf_evlist__new();
- if (trace.evlist == NULL)
- return -ENOMEM;
if (trace.evlist == NULL) {
pr_err("Not enough memory to run!\n");
+ err = -ENOMEM;
goto out;
}
next prev parent reply other threads:[~2015-05-15 6:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 12:28 [PATCH 1/2] perf tests: Fix to get negative exit codes He Kuang
2015-05-11 12:28 ` [PATCH 2/2] perf trace: Fix typo in builtin-trace.c He Kuang
2015-05-11 14:06 ` Arnaldo Carvalho de Melo
2015-05-15 6:43 ` tip-bot for He Kuang [this message]
2015-05-11 13:17 ` [PATCH 1/2] perf tests: Fix to get negative exit codes Jiri Olsa
2015-05-11 14:07 ` Arnaldo Carvalho de Melo
2015-05-15 6:44 ` [tip:perf/core] " tip-bot for He Kuang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-ff8f695c0ec9d73d8a9f92fe634d6476ad74e3a1@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=hekuang@huawei.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox