From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69B6EC33CB1 for ; Thu, 16 Jan 2020 11:35:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B6C12073A for ; Thu, 16 Jan 2020 11:35:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726440AbgAPLfT (ORCPT ); Thu, 16 Jan 2020 06:35:19 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:51358 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726018AbgAPLfT (ORCPT ); Thu, 16 Jan 2020 06:35:19 -0500 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1is3Qg-0005Pk-4r; Thu, 16 Jan 2020 12:35:14 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 91B831C0334; Thu, 16 Jan 2020 12:35:13 +0100 (CET) Date: Thu, 16 Jan 2020 11:35:13 -0000 From: "tip-bot2 for Jisheng Zhang" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: core/core] watchdog: Remove soft_lockup_hrtimer_cnt and related code Cc: Jisheng Zhang , Thomas Gleixner , x86 , LKML In-Reply-To: <20191218131720.4146aea2@xhacker.debian> References: <20191218131720.4146aea2@xhacker.debian> MIME-Version: 1.0 Message-ID: <157917451326.396.13435521512432492165.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 AuthorDate: Wed, 18 Dec 2019 05:31:25 Committer: Thomas Gleixner 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 Signed-off-by: Thomas Gleixner 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));