From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932632AbbI2Gki (ORCPT ); Tue, 29 Sep 2015 02:40:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54815 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932565AbbI2Gka (ORCPT ); Tue, 29 Sep 2015 02:40:30 -0400 Date: Tue, 29 Sep 2015 07:40:20 +0100 From: Aaron Tomlin To: Ulrich Obergfell Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, dzickus@redhat.com Subject: Re: [PATCH 2/5] watchdog: move watchdog_disable_all_cpus() outside of ifdef Message-ID: <20150929064020.GH25024@atomlin.usersys.redhat.com> References: <1443473052-3053-1-git-send-email-uobergfe@redhat.com> <1443473052-3053-3-git-send-email-uobergfe@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="J4XPiPrVK1ev6Sgr" Content-Disposition: inline In-Reply-To: <1443473052-3053-3-git-send-email-uobergfe@redhat.com> X-PGP-Key: http://pgp.mit.edu/pks/lookup?search=atomlin%40redhat.com X-PGP-Fingerprint: 7906 84EB FA8A 9638 8D1E 6E9B E2DE 9658 19CC 77D6 User-Agent: Mutt/1.5.23.1-rc1 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --J4XPiPrVK1ev6Sgr Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon 2015-09-28 22:44 +0200, Ulrich Obergfell wrote: > It makes sense to place watchdog_{dis|enable}_all_cpus() outside of > the ifdef so that _both_ are available even if CONFIG_SYSCTL is not > defined. >=20 > Signed-off-by: Ulrich Obergfell > --- > kernel/watchdog.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/kernel/watchdog.c b/kernel/watchdog.c > index cd9a504..eb9527c 100644 > --- a/kernel/watchdog.c > +++ b/kernel/watchdog.c > @@ -347,6 +347,9 @@ static void watchdog_interrupt_count(void) > static int watchdog_nmi_enable(unsigned int cpu); > static void watchdog_nmi_disable(unsigned int cpu); > =20 > +static int watchdog_enable_all_cpus(void); > +static void watchdog_disable_all_cpus(void); > + > /* watchdog kicker functions */ > static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) > { > @@ -756,9 +759,6 @@ static int watchdog_enable_all_cpus(void) > return err; > } > =20 > -/* prepare/enable/disable routines */ > -/* sysctl functions */ > -#ifdef CONFIG_SYSCTL > static void watchdog_disable_all_cpus(void) > { > if (watchdog_running) { > @@ -767,6 +767,8 @@ static void watchdog_disable_all_cpus(void) > } > } > =20 > +#ifdef CONFIG_SYSCTL > + > /* > * Update the run state of the lockup detectors. > */ Reviewed-by: Aaron Tomlin --J4XPiPrVK1ev6Sgr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWCjJUAAoJEOLellgZzHfW4wwP/1SRmg5Tyvs5rMb0/+qHDAsN Ml4S02yOCkLE2UhE2/7cwhgtTi0CPD79VYWWOkdsBRTVS9xLBlIULCeml6XOpwwa qWkV1HvLCU5PeZWenVotp0vL9uTV9iJ6zPB9SPaGc+l80VIPV4jkkGSaCm+FukQR omEpxjMZEtYoTVNdkhW7HqJkbMmw6p/DXqKkpmB8zED7op/CZ4nE7yTYSiNMuRie bXKRc4FbckjV8D8mr5UhELVHZvmR9ewcuY8crKataq2ZE+uCt7YWiQjD4CQIUjA6 m/a81H2nrCsHtKBSApqcwZMBzS30YN/iVB1/7JaAHA8CLm2rDsndKPStT/i+X7ZL H6HxnbXEO0T8qrctnhJpqfGOYHC0XZU7xQiyPgE3z3onoI3mVwbtj7ir7j32KqoD 8+Tvxy5jt3FqY3JFNhUCoO55h+3LrrtMZoFO3b+pa4fiJ3rtDKWGbpPrDu19xh7p N+XBNtJuLvZSlrdOz9bLaoKNvzYXABYsauTYHv9PEi0wz4MQW0LWfRF9Pm4fGcJm fl10crVlPkIdiEw+IghvGXMSBvMY6lAHHqFZ+/d9UAjxDjCJHPD6Ulu/srwEoiA+ 2Zm1UFknAsVjwl46ymCN0N6RsuUq3WPqXeTUrfeiro2VHyiFW226VQG7kE30fnN7 4PGuVyTsKA/pBRSJcStl =3buS -----END PGP SIGNATURE----- --J4XPiPrVK1ev6Sgr--