From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757365AbcGJSRy (ORCPT ); Sun, 10 Jul 2016 14:17:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54000 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756319AbcGJSRv (ORCPT ); Sun, 10 Jul 2016 14:17:51 -0400 Date: Sun, 10 Jul 2016 11:17:14 -0700 From: tip-bot for Vegard Nossum Message-ID: Cc: vegard.nossum@oracle.com, linux-kernel@vger.kernel.org, acme@redhat.com, torvalds@linux-foundation.org, peterz@infradead.org, jolsa@redhat.com, mingo@kernel.org, slaoub@gmail.com, alexander.shishkin@linux.intel.com, hpa@zytor.com, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, vegard.nossum@oracle.com, torvalds@linux-foundation.org, peterz@infradead.org, acme@redhat.com, mingo@kernel.org, jolsa@redhat.com, tglx@linutronix.de, hpa@zytor.com, slaoub@gmail.com, alexander.shishkin@linux.intel.com In-Reply-To: <1468170841-17045-1-git-send-email-vegard.nossum@oracle.com> References: <1468170841-17045-1-git-send-email-vegard.nossum@oracle.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86: Fix bogus kernel printk, again Git-Commit-ID: eb019503569c8c701f1e9c70e848d99c6680839b 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: eb019503569c8c701f1e9c70e848d99c6680839b Gitweb: http://git.kernel.org/tip/eb019503569c8c701f1e9c70e848d99c6680839b Author: Vegard Nossum AuthorDate: Sun, 10 Jul 2016 19:14:01 +0200 Committer: Ingo Molnar CommitDate: Sun, 10 Jul 2016 20:05:48 +0200 perf/x86: Fix bogus kernel printk, again This showed up as "6Failed to access..." here. Signed-off-by: Vegard Nossum Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Chen Yucong Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: 1b74dde7c47c ("x86/cpu: Convert printk(KERN_ ...) to pr_(...)") Link: http://lkml.kernel.org/r/1468170841-17045-1-git-send-email-vegard.nossum@oracle.com Signed-off-by: Ingo Molnar --- arch/x86/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 26ced53..91eac39 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -263,7 +263,7 @@ static bool check_hw_exists(void) msr_fail: pr_cont("Broken PMU hardware detected, using software events only.\n"); - pr_info("%sFailed to access perfctr msr (MSR %x is %Lx)\n", + printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n", boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR, reg, val_new);