From: Youngmin Nam <youngmin.nam@samsung.com>
Date: Thu, 2 May 2019 07:47:46 +0000 (+0900)
Subject: watchdog: fix build error
X-Git-Tag: MMI-QSAS30.62-33-3~994
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb3eb633b99c68343fe861218236646b58bfac2f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

watchdog: fix build error

Change-Id: I7fb4da0909d6bd90ce730d918ebb1a1a7ad168ff
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>
---

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index c4f8a1fa2453..47f451e78c8a 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -110,10 +110,7 @@ __setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup);
  * SOFTLOCKUP_DETECTOR Kconfig.
  */
 
-#ifdef CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU
-static int watchdog_nmi_enable(unsigned int cpu);
-static void watchdog_nmi_disable(unsigned int cpu);
-#else
+#ifndef CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU
 int __weak watchdog_nmi_enable(unsigned int cpu)
 {
 	hardlockup_detector_perf_enable();
@@ -915,7 +912,7 @@ void touch_nmi_watchdog(void)
 }
 EXPORT_SYMBOL(touch_nmi_watchdog);
 
-static int watchdog_nmi_enable(unsigned int cpu)
+int watchdog_nmi_enable(unsigned int cpu)
 {
 	/*
 	 * The new cpu will be marked online before the first hrtimer interrupt
@@ -931,7 +928,7 @@ static int watchdog_nmi_enable(unsigned int cpu)
 	return 0;
 }
 
-static void watchdog_nmi_disable(unsigned int cpu)
+void watchdog_nmi_disable(unsigned int cpu)
 {
 	unsigned int next_cpu = watchdog_next_cpu(cpu);