From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752158AbbHMIEf (ORCPT ); Thu, 13 Aug 2015 04:04:35 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51114 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751998AbbHMIE1 (ORCPT ); Thu, 13 Aug 2015 04:04:27 -0400 Date: Thu, 13 Aug 2015 01:03:56 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, eranian@google.com, namhyung@kernel.org, acme@redhat.com, jolsa@redhat.com, fweisbec@gmail.com, milian.wolff@kdab.com, dsahern@gmail.com, tglx@linutronix.de, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, bp@suse.de Reply-To: mingo@kernel.org, hpa@zytor.com, fweisbec@gmail.com, eranian@google.com, acme@redhat.com, jolsa@redhat.com, namhyung@kernel.org, milian.wolff@kdab.com, dsahern@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, bp@suse.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Add missing clockid entries Git-Commit-ID: 28ebb87c73f9c17266d4f7570d65a1e695df7d9d 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: 28ebb87c73f9c17266d4f7570d65a1e695df7d9d Gitweb: http://git.kernel.org/tip/28ebb87c73f9c17266d4f7570d65a1e695df7d9d Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 11 Aug 2015 10:38:38 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 12 Aug 2015 10:27:02 -0300 perf trace: Add missing clockid entries We were missing: CLOCK_BOOTTIME, CLOCK_REALTIME_ALARM, CLOCK_BOOTTIME_ALARM, CLOCK_SGI_CYCLE and CLOCK_TAI. Add them. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-d67rwqtwm9jyenwes98kr0cr@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 7cdcbee..5c494a8 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -599,7 +599,8 @@ static DEFINE_STRARRAY(sighow); static const char *clockid[] = { "REALTIME", "MONOTONIC", "PROCESS_CPUTIME_ID", "THREAD_CPUTIME_ID", - "MONOTONIC_RAW", "REALTIME_COARSE", "MONOTONIC_COARSE", + "MONOTONIC_RAW", "REALTIME_COARSE", "MONOTONIC_COARSE", "BOOTTIME", + "REALTIME_ALARM", "BOOTTIME_ALARM", "SGI_CYCLE", "TAI" }; static DEFINE_STRARRAY(clockid);