From: Randy Dunlap <rdun...@infradead.org>

Fix build error when
CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
# CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP is not set
# CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC is not set

Fixes this build error:

../drivers/watchdog/watchdog_pretimeout.c: In function 
‘watchdog_register_governor’:
../drivers/watchdog/watchdog_pretimeout.c:139:26: error: 
‘WATCHDOG_PRETIMEOUT_DEFAULT_GOV’ undeclared (first use in this function)
  if (!strncmp(gov->name, WATCHDOG_PRETIMEOUT_DEFAULT_GOV,

Signed-off-by: Randy Dunlap <rdun...@infradead.org>
Cc: Vladimir Zapolskiy <vladimir_zapols...@mentor.com>
Cc: Wim Van Sebroeck <w...@linux-watchdog.org>
Cc: Guenter Roeck <li...@roeck-us.net>
Cc: linux-watch...@vger.kernel.org
---
Found in linux-next but applies to mainline.

 drivers/watchdog/watchdog_pretimeout.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- linux-next-20190507.orig/drivers/watchdog/watchdog_pretimeout.c
+++ linux-next-20190507/drivers/watchdog/watchdog_pretimeout.c
@@ -118,7 +118,6 @@ EXPORT_SYMBOL_GPL(watchdog_notify_pretim
 
 int watchdog_register_governor(struct watchdog_governor *gov)
 {
-       struct watchdog_pretimeout *p;
        struct governor_priv *priv;
 
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
@@ -136,8 +135,11 @@ int watchdog_register_governor(struct wa
        priv->gov = gov;
        list_add(&priv->entry, &governor_list);
 
+#if defined(WATCHDOG_PRETIMEOUT_DEFAULT_GOV)
        if (!strncmp(gov->name, WATCHDOG_PRETIMEOUT_DEFAULT_GOV,
                     WATCHDOG_GOV_NAME_MAXLEN)) {
+               struct watchdog_pretimeout *p;
+
                spin_lock_irq(&pretimeout_lock);
                default_gov = gov;
 
@@ -146,6 +148,7 @@ int watchdog_register_governor(struct wa
                                p->wdd->gov = default_gov;
                spin_unlock_irq(&pretimeout_lock);
        }
+#endif
 
        mutex_unlock(&governor_lock);
 


Reply via email to