From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.7 required=3.0 tests=DATE_IN_PAST_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F599C2D0DB for ; Wed, 22 Jan 2020 13:28:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55EBA24125 for ; Wed, 22 Jan 2020 13:28:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699682; bh=c+tAHl7rKqHexa/ZvutCPfX7AcAg56Ionp2mrmpOZMk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kBOikQxTbKs51Bq+a9gSg4EuFLPV4Y7vR8v51eDIMOl8s2w9Yc7vtUYai325xi0HL TmBUXue1ubSxj0xkrnUcFsVW7ECZerpnJU5Kx6WcUiQZWo+lf7gbghIqFhMPg4PsC3 FEfbmiuqUsXE6sGTyEO1pXdzYRLho6REsVQ+V8kw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731988AbgAVN2B (ORCPT ); Wed, 22 Jan 2020 08:28:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:49824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729742AbgAVN16 (ORCPT ); Wed, 22 Jan 2020 08:27:58 -0500 Received: from localhost (unknown [84.241.205.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BFC0D205F4; Wed, 22 Jan 2020 13:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699678; bh=c+tAHl7rKqHexa/ZvutCPfX7AcAg56Ionp2mrmpOZMk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qPsOqkZ9u0fmdao8gSY6pkQrQpr88I7jsNEMcBRlqhz/Ch9hjVcYDepbpAeTNi2gn q1jcbEZO8mfevfHSTvFlCnkyR7EWjobTvqy25erk0ftvxL3uecl8bA4kTsqKa4E3IN O6NegQ+cleZF8efzt1vlEhaljjNlInOgsp78f+BA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andi Kleen , Jiri Olsa , Arnaldo Carvalho de Melo Subject: [PATCH 5.4 216/222] perf script: Allow --time with --reltime Date: Wed, 22 Jan 2020 10:30:02 +0100 Message-Id: <20200122092849.159018562@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092833.339495161@linuxfoundation.org> References: <20200122092833.339495161@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen commit 3714437d3fcc7956cabcb0077f2a506b61160a56 upstream. The original --reltime patch forbid --time with --reltime. But it turns out --time doesn't really care about --reltime, because the relative time is only used at final output, while the time filtering always works earlier on absolute time. So just remove the check and allow combining the two options. Fixes: 90b10f47c0ee ("perf script: Support relative time") Signed-off-by: Andi Kleen Acked-by: Jiri Olsa Link: http://lore.kernel.org/lkml/20191002164642.1719-1-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/builtin-script.c | 5 ----- 1 file changed, 5 deletions(-) --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -3605,11 +3605,6 @@ int cmd_script(int argc, const char **ar } } - if (script.time_str && reltime) { - fprintf(stderr, "Don't combine --reltime with --time\n"); - return -1; - } - if (itrace_synth_opts.callchain && itrace_synth_opts.callchain_sz > scripting_max_stack) scripting_max_stack = itrace_synth_opts.callchain_sz;