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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E394C433EF for ; Mon, 4 Oct 2021 09:34:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 256DF6128A for ; Mon, 4 Oct 2021 09:34:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 256DF6128A Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HuaW9dHrKaPWoxcPn0NoaEDz1ge1rNZq1W+STwmRKpc=; b=3WH1AXQlyqnrb9 KA05y/Z2/zzeuE6cByHGFEzqeuB/1SXuCTjFeug78bFqHYpBc0xndBfRoTnM2p9MjylXbVcT4ntIx pvcfds4F4DnxOrvFbpb4Ej9lk0anc+8guKst8Ts6LGfGUb/k7kMizhOqzVgBMxTbhiJmWcR/X/m/G oZq8FsmcIeMhZJZZv3dsfbzhECsIcUAc7tIZZXfGkXGUGwgWGV9yohBJ9VUqH/SNpwdghsWoPingu EfO5N5XT7DHyx8Jt3+ylsUDted9jFgcsvSA7LPWYlqvUpmUHdSH1VaIVG4NTWynJulgqDTe0KXeyS 4JpYUQ+6WNZ4xqQXMLuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXKL1-005mNK-AC; Mon, 04 Oct 2021 09:32:47 +0000 Received: from smtp-out1.suse.de ([195.135.220.28]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXKKx-005mM6-ES for linux-arm-kernel@lists.infradead.org; Mon, 04 Oct 2021 09:32:44 +0000 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id A8BD422208; Mon, 4 Oct 2021 09:32:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1633339961; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cVbR2AIszwjTu+A/NL6X3/123fGAWjpDPUfYJkyefYg=; b=k9QSkT/CMufpYhIXrC+LwvfrQfjiGkp8+OjIFosOO/CHZOZ0CICesmEuublBNaRRjwnB2Y u3JNVKrHeuOKSf/Iryx3832vIw0VT7efcAfwzRHAVNy8Da9FYo5olH5eww1gk9w1tzTrk9 TwdGnSbLCtdaBej7s8qiC1r8NKEtcl8= Received: from suse.cz (unknown [10.100.224.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 32880A3B9C; Mon, 4 Oct 2021 09:32:41 +0000 (UTC) Date: Mon, 4 Oct 2021 11:32:41 +0200 From: Petr Mladek To: Pingfan Liu Cc: linux-kernel@vger.kernel.org, Andrew Morton , Wang Qing , "Peter Zijlstra (Intel)" , Santosh Sivaraj , linux-arm-kernel@lists.infradead.org Subject: Re: [PATCHv2 1/4] kernel/watchdog: trival cleanups Message-ID: References: <20210923140951.35902-1-kernelfans@gmail.com> <20210923140951.35902-2-kernelfans@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210923140951.35902-2-kernelfans@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211004_023243_665891_B40F4E0A X-CRM114-Status: GOOD ( 18.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu 2021-09-23 22:09:48, Pingfan Liu wrote: > No reference to WATCHDOG_DEFAULT, remove it. > > And nobody cares about the return value of watchdog_nmi_enable(), > changing its prototype to void. > > Signed-off-by: Pingfan Liu > Cc: Petr Mladek > Cc: Andrew Morton > Cc: Wang Qing > Cc: "Peter Zijlstra (Intel)" > Cc: Santosh Sivaraj > Cc: linux-arm-kernel@lists.infradead.org > To: linux-kernel@vger.kernel.org > --- > include/linux/nmi.h | 2 +- > kernel/watchdog.c | 5 +---- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/include/linux/nmi.h b/include/linux/nmi.h > index 750c7f395ca9..b7bcd63c36b4 100644 > --- a/include/linux/nmi.h > +++ b/include/linux/nmi.h > @@ -119,7 +119,7 @@ static inline int hardlockup_detector_perf_init(void) { return 0; } > void watchdog_nmi_stop(void); > void watchdog_nmi_start(void); > int watchdog_nmi_probe(void); > -int watchdog_nmi_enable(unsigned int cpu); > +void watchdog_nmi_enable(unsigned int cpu); > void watchdog_nmi_disable(unsigned int cpu); > > /** > diff --git a/kernel/watchdog.c b/kernel/watchdog.c > index ad912511a0c0..6e6dd5f0bc3e 100644 > --- a/kernel/watchdog.c > +++ b/kernel/watchdog.c > @@ -30,10 +30,8 @@ > static DEFINE_MUTEX(watchdog_mutex); > > #if defined(CONFIG_HARDLOCKUP_DETECTOR) || defined(CONFIG_HAVE_NMI_WATCHDOG) > -# define WATCHDOG_DEFAULT (SOFT_WATCHDOG_ENABLED | NMI_WATCHDOG_ENABLED) > # define NMI_WATCHDOG_DEFAULT 1 > #else > -# define WATCHDOG_DEFAULT (SOFT_WATCHDOG_ENABLED) > # define NMI_WATCHDOG_DEFAULT 0 > #endif > > @@ -95,10 +93,9 @@ __setup("nmi_watchdog=", hardlockup_panic_setup); > * softlockup watchdog start and stop. The arch must select the > * SOFTLOCKUP_DETECTOR Kconfig. > */ > -int __weak watchdog_nmi_enable(unsigned int cpu) > +void __weak watchdog_nmi_enable(unsigned int cpu) It is __weak. spart specific implementation is in arch/sparc/kernel/nmi.c. It has to be updated as well. Best Regards, Petr _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel