From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932170AbdJXOyg (ORCPT ); Tue, 24 Oct 2017 10:54:36 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52201 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751323AbdJXOyd (ORCPT ); Tue, 24 Oct 2017 10:54:33 -0400 Date: Tue, 24 Oct 2017 07:49:42 -0700 From: tip-bot for Frederic Weisbecker Message-ID: Cc: torvalds@linux-foundation.org, lcapitulino@redhat.com, mingo@kernel.org, tglx@linutronix.de, cl@linux.com, kernellwp@gmail.com, riel@redhat.com, paulmck@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, efault@gmx.de, hpa@zytor.com, peterz@infradead.org, frederic@kernel.org, cmetcalf@mellanox.com Reply-To: kernellwp@gmail.com, riel@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de, lcapitulino@redhat.com, mingo@kernel.org, cl@linux.com, peterz@infradead.org, frederic@kernel.org, cmetcalf@mellanox.com, paulmck@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, efault@gmx.de, hpa@zytor.com In-Reply-To: <1508850421-10058-3-git-send-email-frederic@kernel.org> References: <1508850421-10058-3-git-send-email-frederic@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] watchdog: Use housekeeping_cpumask() instead of ad-hoc version Git-Commit-ID: 50e8101e1924460ad9349ba13782d64ce034a64f 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: 50e8101e1924460ad9349ba13782d64ce034a64f Gitweb: https://git.kernel.org/tip/50e8101e1924460ad9349ba13782d64ce034a64f Author: Frederic Weisbecker AuthorDate: Tue, 24 Oct 2017 15:06:51 +0200 Committer: Ingo Molnar CommitDate: Tue, 24 Oct 2017 15:20:13 +0200 watchdog: Use housekeeping_cpumask() instead of ad-hoc version While trying to disable the watchog on nohz_full CPUs, the watchdog implements an ad-hoc version of housekeeping_cpumask(). Lets replace those re-invented lines. Signed-off-by: Frederic Weisbecker Cc: Chris Metcalf Cc: Christoph Lameter Cc: Linus Torvalds Cc: Luiz Capitulino Cc: Mike Galbraith Cc: Paul E. McKenney Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: Wanpeng Li Link: http://lkml.kernel.org/r/1508850421-10058-3-git-send-email-frederic@kernel.org Signed-off-by: Ingo Molnar --- kernel/watchdog.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index d71eee0..3ddce04 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -774,15 +774,10 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write, void __init lockup_detector_init(void) { -#ifdef CONFIG_NO_HZ_FULL - if (tick_nohz_full_enabled()) { + if (tick_nohz_full_enabled()) pr_info("Disabling watchdog on nohz_full cores by default\n"); - cpumask_copy(&watchdog_cpumask, housekeeping_mask); - } else - cpumask_copy(&watchdog_cpumask, cpu_possible_mask); -#else - cpumask_copy(&watchdog_cpumask, cpu_possible_mask); -#endif + + cpumask_copy(&watchdog_cpumask, housekeeping_cpumask()); if (!watchdog_nmi_probe()) nmi_watchdog_available = true;