From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752932AbdDEFwf (ORCPT ); Wed, 5 Apr 2017 01:52:35 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49503 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751096AbdDEFwd (ORCPT ); Wed, 5 Apr 2017 01:52:33 -0400 Date: Tue, 4 Apr 2017 22:51:25 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Remove die() call Git-Commit-ID: 427748068a973627b406bf7312342b6fe4742d07 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 427748068a973627b406bf7312342b6fe4742d07 Gitweb: http://git.kernel.org/tip/427748068a973627b406bf7312342b6fe4742d07 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 4 Apr 2017 11:36:22 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 4 Apr 2017 11:36:22 -0300 perf tools: Remove die() call We can just use the exit() right after the branch calling die(). Link: http://lkml.kernel.org/n/tip-90athn06d7atf2jkpfvq1iic@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 9217f22..9dc346f 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -378,7 +378,8 @@ static void execv_dashed_external(const char **argv) if (status != -ERR_RUN_COMMAND_EXEC) { if (IS_RUN_COMMAND_ERR(status)) { do_die: - die("unable to run '%s'", argv[0]); + pr_err("FATAL: unable to run '%s'", argv[0]); + status = -128; } exit(-status); }