From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752191AbdGAIuR (ORCPT ); Sat, 1 Jul 2017 04:50:17 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52719 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751749AbdGAIuQ (ORCPT ); Sat, 1 Jul 2017 04:50:16 -0400 Date: Sat, 1 Jul 2017 01:48:04 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@kernel.org, tglx@linutronix.de, namhyung@kernel.org, acme@redhat.com, wangnan0@huawei.com, dsahern@gmail.com, adrian.hunter@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, dsahern@gmail.com, adrian.hunter@intel.com, acme@redhat.com, wangnan0@huawei.com, jolsa@kernel.org, tglx@linutronix.de, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf event-parse: Use pr_warning() Git-Commit-ID: d2a74d53aa896046abcd152c03777209c57b12a2 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: d2a74d53aa896046abcd152c03777209c57b12a2 Gitweb: http://git.kernel.org/tip/d2a74d53aa896046abcd152c03777209c57b12a2 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 27 Jun 2017 11:08:14 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 27 Jun 2017 11:08:14 -0300 perf event-parse: Use pr_warning() Convert sole user of warning() in this file to pr_warning(), consolidating error reporting facilities. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-3y7yf6v673ujl2rcs34tzv8n@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/trace-event-parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 746bbee..e0a6e9a 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -24,7 +24,7 @@ #include #include "../perf.h" -#include "util.h" +#include "debug.h" #include "trace-event.h" #include "sane_ctype.h" @@ -150,7 +150,7 @@ void parse_ftrace_printk(struct pevent *pevent, while (line) { addr_str = strtok_r(line, ":", &fmt); if (!addr_str) { - warning("printk format with empty entry"); + pr_warning("printk format with empty entry"); break; } addr = strtoull(addr_str, NULL, 16);