linux-kernel - [tip:perf/core] perf ftrace: Remove needless code setting default tracer

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-bf062bd20e6c4988a9c593824ea6bb58730b6289@git.kernel.org>
Date:   Wed, 1 Feb 2017 06:37:08 -0800
From:   tip-bot for Taeung Song <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     treeze.taeung@...il.com, jolsa@...nel.org, wangnan0@...wei.com,
        namhyung@...nel.org, acme@...hat.com, tglx@...utronix.de,
        linux-kernel@...r.kernel.org, mingo@...nel.org, hpa@...or.com,
        peterz@...radead.org
Subject: [tip:perf/core] perf ftrace: Remove needless code setting default
 tracer

Commit-ID:  bf062bd20e6c4988a9c593824ea6bb58730b6289
Gitweb:     http://git.kernel.org/tip/bf062bd20e6c4988a9c593824ea6bb58730b6289
Author:     Taeung Song <treeze.taeung@...il.com>
AuthorDate: Thu, 26 Jan 2017 18:35:37 +0900
Committer:  Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Thu, 26 Jan 2017 15:53:27 -0300

perf ftrace: Remove needless code setting default tracer

As a result of commit a3497642c261 ("perf ftrace: Make 'function_graph'
be the default tracer") the ftrace.tracer variable can't be NULL but the
other code setting default tracer remained.

Signed-off-by: Taeung Song <treeze.taeung@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: http://lkml.kernel.org/r/1485423339-22780-1-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
 tools/perf/builtin-ftrace.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index d05658d..414444d 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -202,7 +202,7 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
 {
 	int ret;
 	struct perf_ftrace ftrace = {
-		.tracer = "function_graph",
+		.tracer = DEFAULT_TRACER,
 		.target = { .uid = UINT_MAX, },
 	};
 	const char * const ftrace_usage[] = {
@@ -231,9 +231,6 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
 	if (ret < 0)
 		goto out_delete_evlist;
 
-	if (ftrace.tracer == NULL)
-		ftrace.tracer = DEFAULT_TRACER;
-
 	ret = __cmd_ftrace(&ftrace, argc, argv);
 
 out_delete_evlist: