[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-13316b31fdaaa45f06793eb7992588359ba6ab9f@git.kernel.org>
Date: Fri, 27 Oct 2017 05:02:12 -0700
From: tip-bot for Frederic Weisbecker <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, paulmck@...ux.vnet.ibm.com, kernellwp@...il.com,
cl@...ux.com, linux-kernel@...r.kernel.org, efault@....de,
torvalds@...ux-foundation.org, riel@...hat.com,
lcapitulino@...hat.com, mingo@...nel.org, cmetcalf@...lanox.com,
peterz@...radead.org, tglx@...utronix.de, frederic@...nel.org
Subject: [tip:sched/core] sched/isolation, watchdog: Use
housekeeping_cpumask() instead of ad-hoc version
Commit-ID: 13316b31fdaaa45f06793eb7992588359ba6ab9f
Gitweb: https://git.kernel.org/tip/13316b31fdaaa45f06793eb7992588359ba6ab9f
Author: Frederic Weisbecker <frederic@...nel.org>
AuthorDate: Fri, 27 Oct 2017 04:42:29 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 27 Oct 2017 09:55:25 +0200
sched/isolation, 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 <frederic@...nel.org>
Acked-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Chris Metcalf <cmetcalf@...lanox.com>
Cc: Christoph Lameter <cl@...ux.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Luiz Capitulino <lcapitulino@...hat.com>
Cc: Mike Galbraith <efault@....de>
Cc: Paul E. McKenney <paulmck@...ux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Rik van Riel <riel@...hat.com>
Cc: Wanpeng Li <kernellwp@...il.com>
Link: http://lkml.kernel.org/r/1509072159-31808-3-git-send-email-frederic@kernel.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/watchdog.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 3c44dba..562652c 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;
Powered by blists - more mailing lists