From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320AbbI1Ulm (ORCPT ); Mon, 28 Sep 2015 16:41:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55723 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752339AbbI1Uk2 (ORCPT ); Mon, 28 Sep 2015 16:40:28 -0400 From: Ulrich Obergfell To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, dzickus@redhat.com, atomlin@redhat.com, uobergfe@redhat.com Subject: [PATCH 2/5] watchdog: move watchdog_disable_all_cpus() outside of ifdef Date: Mon, 28 Sep 2015 22:44:09 +0200 Message-Id: <1443473052-3053-3-git-send-email-uobergfe@redhat.com> In-Reply-To: <1443473052-3053-1-git-send-email-uobergfe@redhat.com> References: <1443473052-3053-1-git-send-email-uobergfe@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Ulrich Obergfell --- kernel/watchdog.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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); +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; } -/* 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) } } +#ifdef CONFIG_SYSCTL + /* * Update the run state of the lockup detectors. */ -- 1.7.11.7