From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755167AbcKUQgJ (ORCPT ); Mon, 21 Nov 2016 11:36:09 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35674 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754380AbcKUQgG (ORCPT ); Mon, 21 Nov 2016 11:36:06 -0500 From: Prarit Bhargava To: linux-kernel@vger.kernel.org Cc: Prarit Bhargava , Borislav Petkov , Tejun Heo , Don Zickus , Hidehiro Kawai , Thomas Gleixner , Andi Kleen , Joshua Hunt , Ingo Molnar Subject: [PATCH] kernel/watchdog.c: Only output hw-PMU message once Date: Mon, 21 Nov 2016 11:35:19 -0500 Message-Id: <1479746119-25239-1-git-send-email-prarit@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 21 Nov 2016 16:35:34 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_BOOTPARAM_HOTPLUG_CPU0 is enabled, the socket containing the boot cpu can be replaced. During the hot add event, the message NMI watchdog: enabled on all CPUs, permanently consumes one hw-PMU counter. is output implying that the NMI was disabled at some point. This is not the case and the message has caused confusion for users of systems that support socket removal. This patch modifies the message so that it only outputs a single time during runtime. Signed-off-by: Prarit Bhargava Cc: Borislav Petkov Cc: Tejun Heo Cc: Don Zickus Cc: Hidehiro Kawai Cc: Thomas Gleixner Cc: Andi Kleen Cc: Joshua Hunt Cc: Ingo Molnar --- kernel/watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 9acb29f280ec..560414692c01 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -615,7 +615,7 @@ static int watchdog_nmi_enable(unsigned int cpu) if (!IS_ERR(event)) { /* only print for cpu0 or different than cpu0 */ if (cpu == 0 || cpu0_err) - pr_info("enabled on all CPUs, permanently consumes one hw-PMU counter.\n"); + pr_info_once("enabled on all CPUs, permanently consumes one hw-PMU counter.\n"); goto out_save; } -- 1.7.9.3