Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58cf690a authored by Ulrich Obergfell's avatar Ulrich Obergfell Committed by Linus Torvalds
Browse files

watchdog: move watchdog_disable_all_cpus() outside of ifdef 



Move watchdog_disable_all_cpus() outside of the ifdef so that it is
available if CONFIG_SYSCTL is not defined.  This is preparation for
"watchdog: implement error handling in update_watchdog_all_cpus() and
callers".

Signed-off-by: default avatarUlrich Obergfell <uobergfe@redhat.com>
Reviewed-by: default avatarAaron Tomlin <atomlin@redhat.com>
Acked-by: default avatarDon Zickus <dzickus@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d283c640

kernel/watchdog.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -347,6 +347,9 @@ static void watchdog_interrupt_count(void) 
static int watchdog_nmi_enable(unsigned int cpu);

static int watchdog_nmi_enable(unsigned int cpu);

static void watchdog_nmi_disable(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 */

/* watchdog kicker functions */

static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)

static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)

{

{
@@ -756,9 +759,6 @@ static int watchdog_enable_all_cpus(void) 
	return err;

	return err;

}

}





/* prepare/enable/disable routines */

/* sysctl functions */

#ifdef CONFIG_SYSCTL

static void watchdog_disable_all_cpus(void)

static void watchdog_disable_all_cpus(void)

{

{

	if (watchdog_running) {

	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.

 * Update the run state of the lockup detectors.

 */

 */