Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230523122324.1668396-1-trix@redhat.com> <CAD=FV=W5HrBFakvoX-cQ5G=4xV1upkFPZ6aSR8me+d+aCpirgg@mail.gmail.com>
 <CAD=FV=V_i5wR4oNy+xarA9e=VcgpH6i3U1uxFKtsaOe5AQX=Zw@mail.gmail.com>
In-Reply-To: <CAD=FV=V_i5wR4oNy+xarA9e=VcgpH6i3U1uxFKtsaOe5AQX=Zw@mail.gmail.com>
From:   Doug Anderson <dianders@chromium.org>
Date:   Thu, 25 May 2023 16:31:25 -0700
Message-ID: <CAD=FV=Xo4tXtT5jJtEX2tvTZBhnnrYOurNz8Uio6_1YOkLUNEQ@mail.gmail.com>
Subject: Re: [PATCH] watchdog: set variables watchdog_soft,hardlockup_user_enabled
 storage-class-specifier to static
To:     Tom Rix <trix@redhat.com>
Cc:     akpm@linux-foundation.org, pmladek@suse.com, kernelfans@gmail.com,
        lecopzer.chen@mediatek.com, ldufour@linux.ibm.com,
        linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi,

On Wed, May 24, 2023 at 11:05=E2=80=AFAM Doug Anderson <dianders@chromium.o=
rg> wrote:
>
> Hi,
>
> On Tue, May 23, 2023 at 7:12=E2=80=AFAM Doug Anderson <dianders@chromium.=
org> wrote:
> >
> > Hi,
> >
> > On Tue, May 23, 2023 at 5:23=E2=80=AFAM Tom Rix <trix@redhat.com> wrote=
:
> > >
> > > smatch reports
> > > kernel/watchdog.c:40:19: warning: symbol
> > >   'watchdog_hardlockup_user_enabled' was not declared. Should it be s=
tatic?
> > > kernel/watchdog.c:41:19: warning: symbol
> > >   'watchdog_softlockup_user_enabled' was not declared. Should it be s=
tatic?
> > >
> > > These variabled are only used in their defining file, so it should be=
 static.
> >
> > s/variabled/variables
> >
> > >
> > > Signed-off-by: Tom Rix <trix@redhat.com>
> > > ---
> > >  kernel/watchdog.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > While your fix is valid (thanks!), it's only half the fix.
> >
> > I wondered why smatch would have suddenly noticed this since the
> > change that touched this variable recently was only a rename. When I
> > dug deeper, I realized that the old names actually _were_ referenced
> > outside this file and my rename missed them. The reason I missed them
> > is that the only reference is an "extern" reference in
> > `include/linux/nmi.h`. The references in `include/linux/nmi.h`
> > probably should have been removed in commit dd0693fdf054 ("watchdog:
> > move watchdog sysctl interface to watchdog.c")
> >
> > ...so a more complete fix would also remove references to the old
> > names (nmi_watchdog_user_enabled and soft_watchdog_user_enabled) in
> > `include/linux/nmi.h`.
>
> FWIW, Petr has the other half of the fix at:
>
> https://lore.kernel.org/r/ZG4TW--j-DdSsUO6@alley
>
> Any chance you could send out a v2 and include that? If I don't see
> something by tomorrow morning I'll try to send out a v2 for you that
> squashes your and his changes.

Maybe it's still morning somewhere. In any case, I squashed and posted:

https://lore.kernel.org/r/20230525162822.1.I0fb41d138d158c9230573eaa37dc56a=
fa2fb14ee@changeid

Assuming that looks OK it should be considered as superseding $SUBJECT patc=
h.