From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754129AbdDKIJk (ORCPT ); Tue, 11 Apr 2017 04:09:40 -0400 Received: from terminus.zytor.com ([65.50.211.136]:42761 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751514AbdDKIHy (ORCPT ); Tue, 11 Apr 2017 04:07:54 -0400 Date: Tue, 11 Apr 2017 00:58:07 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@suse.de, torvalds@linux-foundation.org, eranian@google.com, Suravee.Suthikulpanit@amd.com, hpa@zytor.com, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, acme@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, jolsa@redhat.com Reply-To: eranian@google.com, Suravee.Suthikulpanit@amd.com, torvalds@linux-foundation.org, hpa@zytor.com, bp@suse.de, linux-kernel@vger.kernel.org, jolsa@redhat.com, tglx@linutronix.de, peterz@infradead.org, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, mingo@kernel.org, acme@redhat.com In-Reply-To: <20170410122047.3026-4-bp@alien8.de> References: <20170410122047.3026-4-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/amd/uncore: Fix pr_fmt() prefix Git-Commit-ID: 9df9078ef2086652647248ee6e82ca8f661cb3f5 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: 9df9078ef2086652647248ee6e82ca8f661cb3f5 Gitweb: http://git.kernel.org/tip/9df9078ef2086652647248ee6e82ca8f661cb3f5 Author: Borislav Petkov AuthorDate: Mon, 10 Apr 2017 14:20:47 +0200 Committer: Ingo Molnar CommitDate: Tue, 11 Apr 2017 08:44:59 +0200 perf/amd/uncore: Fix pr_fmt() prefix Make it "perf/amd/uncore: ", i.e., something more specific than "perf: ". Signed-off-by: Borislav Petkov Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Suravee Suthikulpanit Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/20170410122047.3026-4-bp@alien8.de [ Changed it to perf/amd/uncore/ ] Signed-off-by: Ingo Molnar --- arch/x86/events/amd/uncore.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c index 975f24f..ad44af0 100644 --- a/arch/x86/events/amd/uncore.c +++ b/arch/x86/events/amd/uncore.c @@ -30,6 +30,9 @@ #define COUNTER_SHIFT 16 +#undef pr_fmt +#define pr_fmt(fmt) "amd_uncore: " fmt + static int num_counters_llc; static int num_counters_nb; @@ -548,7 +551,7 @@ static int __init amd_uncore_init(void) if (ret) goto fail_nb; - pr_info("perf: AMD NB counters detected\n"); + pr_info("AMD NB counters detected\n"); ret = 0; } @@ -562,7 +565,7 @@ static int __init amd_uncore_init(void) if (ret) goto fail_llc; - pr_info("perf: AMD LLC counters detected\n"); + pr_info("AMD LLC counters detected\n"); ret = 0; }