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 C67C9C433EF for ; Fri, 8 Oct 2021 04:06:15 +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 965A461042 for ; Fri, 8 Oct 2021 04:06:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 965A461042 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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=yBrkbCo4EMsD4nGsQjqIiQkf3th8F4ew9PyN7nMsFvg=; b=nEGVVim9QVntMj BnOF4PWfeSC4025BjCnUIh+h6mplG3lRRSOwbrMVPWjFu9pweq1bzLhvaLU20V3QIhLi3QE8UIlGQ hf3UFWYiE0ofD0q5OFDUjY5eGkxrThlOqgk+9nEj7UrzqExYnN646DHeTu0wFAlSTc6gLUBxrp4Z9 OtBMJ4PhIpR7dmwRG8ikqe/ozFTio1UISp9sHKuqj4euuNawFn+0IF0VTfMsPx9cppk/ffrSv8vwi z7cAfVvp9ysTpAZpB8ozZExmLqaNnGzHUtzr6OgEZ88RcWbCBcQKW0oAKoJiWWDbyXSijAgIlIF8g tfuc9j5RYG2F9k+dnLMA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYh7m-001WhU-Iw; Fri, 08 Oct 2021 04:04:46 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYh7i-001Wfw-S5 for linux-arm-kernel@lists.infradead.org; Fri, 08 Oct 2021 04:04:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633665880; h=from:from:reply-to:subject:subject: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=vpOeeNqdFywLsnpSsY/131/qyW/smsuqZ49HHXhjb5s=; b=c410GV0vgVT2ZrWzFprLrl9+Chb/eGiO2kc2GRbKdg/lOJJmwphsYF7h806sDhQlqjs9ku BLKlai2xGr5IC6fYSAlJ/Br53DAIFbc7fevazbecJ9QgjCHWUn392VXQv48M9A+9wZwgkw BUc1hxF+WQTNrOwqHEAEsc/t1b3+4/g= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-qeLJKDxPPSC98f9nSIIWlw-1; Fri, 08 Oct 2021 00:04:28 -0400 X-MC-Unique: qeLJKDxPPSC98f9nSIIWlw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6280B362F9; Fri, 8 Oct 2021 04:04:27 +0000 (UTC) Received: from piliu.users.ipa.redhat.com (ovpn-8-26.pek2.redhat.com [10.72.8.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EB5565D740; Fri, 8 Oct 2021 04:04:22 +0000 (UTC) Date: Fri, 8 Oct 2021 12:04:18 +0800 From: Pingfan Liu To: Petr Mladek Cc: Pingfan Liu , 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: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211007_210443_029770_19076C63 X-CRM114-Status: GOOD ( 20.79 ) 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 Mon, Oct 04, 2021 at 11:32:41AM +0200, Petr Mladek wrote: > 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. > Oops, I will fix it. Thanks, Pingfan _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel