perf script: Allow --time with --reltime
commit5.4-rM2-2.2.x-imx-squashed3714437d3f
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:90b10f47c0
("perf script: Support relative time") Signed-off-by: Andi Kleen <ak@linux.intel.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Link: http://lore.kernel.org/lkml/20191002164642.1719-1-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
a26701c6c9
commit
483cb2b205
|
@ -3605,11 +3605,6 @@ int cmd_script(int argc, const char **argv)
|
|||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
|
Loading…
Reference in New Issue