From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755720AbcHXJRZ (ORCPT ); Wed, 24 Aug 2016 05:17:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43732 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753286AbcHXJRX (ORCPT ); Wed, 24 Aug 2016 05:17:23 -0400 Date: Wed, 24 Aug 2016 02:17:12 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, tglx@linutronix.de, namhyung@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, rostedt@goodmis.org, jolsa@kernel.org, adrian.hunter@intel.com, wangnan0@huawei.com, acme@redhat.com, mingo@kernel.org Reply-To: hpa@zytor.com, jolsa@kernel.org, rostedt@goodmis.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, tglx@linutronix.de, namhyung@kernel.org, wangnan0@huawei.com, mingo@kernel.org, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Use USEC_PER_MSEC Git-Commit-ID: 0693e680d32e5c7415666ccfcff57ad4cd976294 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: 0693e680d32e5c7415666ccfcff57ad4cd976294 Gitweb: http://git.kernel.org/tip/0693e680d32e5c7415666ccfcff57ad4cd976294 Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 8 Aug 2016 15:05:46 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Aug 2016 15:37:33 -0300 perf record: Use USEC_PER_MSEC Instead of a naked 1000. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Steven Rostedt Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-7v6be7jhvstbkvk3rsytjw0o@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 6355902..a3792e8 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -42,7 +42,7 @@ #include #include #include - +#include struct record { struct perf_tool tool; @@ -954,7 +954,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } if (opts->initial_delay) { - usleep(opts->initial_delay * 1000); + usleep(opts->initial_delay * USEC_PER_MSEC); perf_evlist__enable(rec->evlist); }