[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <157917451326.396.13435521512432492165.tip-bot2@tip-bot2>
Date: Thu, 16 Jan 2020 11:35:13 -0000
From: "tip-bot2 for Jisheng Zhang" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Jisheng Zhang <Jisheng.Zhang@...aptics.com>,
Thomas Gleixner <tglx@...utronix.de>, x86 <x86@...nel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [tip: core/core] watchdog: Remove soft_lockup_hrtimer_cnt and related code
The following commit has been merged into the core/core branch of tip:
Commit-ID: d129479f1fff5c88adbf8dff7649664916d28f81
Gitweb: https://git.kernel.org/tip/d129479f1fff5c88adbf8dff7649664916d28f81
Author: Jisheng Zhang <Jisheng.Zhang@...aptics.com>
AuthorDate: Wed, 18 Dec 2019 05:31:25
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Thu, 16 Jan 2020 12:25:51 +01:00
watchdog: Remove soft_lockup_hrtimer_cnt and related code
After commit 9cf57731b63e ("watchdog/softlockup: Replace "watchdog/%u"
threads with cpu_stop_work"), the percpu soft_lockup_hrtimer_cnt is
not used any more, so remove it and related code.
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@...aptics.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Link: https://lore.kernel.org/r/20191218131720.4146aea2@xhacker.debian
---
kernel/watchdog.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index f41334e..0621301 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -173,7 +173,6 @@ static DEFINE_PER_CPU(struct hrtimer, watchdog_hrtimer);
static DEFINE_PER_CPU(bool, softlockup_touch_sync);
static DEFINE_PER_CPU(bool, soft_watchdog_warn);
static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts);
-static DEFINE_PER_CPU(unsigned long, soft_lockup_hrtimer_cnt);
static DEFINE_PER_CPU(struct task_struct *, softlockup_task_ptr_saved);
static DEFINE_PER_CPU(unsigned long, hrtimer_interrupts_saved);
static unsigned long soft_lockup_nmi_warn;
@@ -350,8 +349,6 @@ static DEFINE_PER_CPU(struct cpu_stop_work, softlockup_stop_work);
*/
static int softlockup_fn(void *data)
{
- __this_cpu_write(soft_lockup_hrtimer_cnt,
- __this_cpu_read(hrtimer_interrupts));
__touch_watchdog();
complete(this_cpu_ptr(&softlockup_completion));
Powered by blists - more mailing lists