From: Randy Dunlap <rdunlap@infradead.org>
To: Guenter Roeck <linux@roeck-us.net>,
LKML <linux-kernel@vger.kernel.org>,
"linux-watchdog@vger.kernel.org" <linux-watchdog@vger.kernel.org>
Cc: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Subject: Re: [PATCH] watchdog: fix watchdog_pretimeout.c build error when no default gov. is set
Date: Tue, 7 May 2019 17:22:35 -0700 [thread overview]
Message-ID: <9fa3055a-a666-021c-6e3e-2d3b6ba4e542@infradead.org> (raw)
In-Reply-To: <aace995d-a076-2fc5-8456-1e2638e4faa6@roeck-us.net>
On 5/7/19 5:07 PM, Guenter Roeck wrote:
> On 5/7/19 4:33 PM, Randy Dunlap wrote:
>> From: Randy Dunlap <rdunlap@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,
>>
>
> Ah, I knew I missed something. The following would be a better fix,
> though, since it enforces that at least one pretimeout governor is enabled
> (matching the old code):
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index e19960ace0c0..4a3461afa96f 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -71,6 +71,12 @@ config WATCHDOG_PRETIMEOUT_GOV
> help
> The option allows to select watchdog pretimeout governors.
>
> +config WATCHDOG_PRETIMEOUT_GOV_SEL
> + tristate
> + depends on WATCHDOG_PRETIMEOUT_GOV
> + default m
> + select WATCHDOG_PRETIMEOUT_GOV_PANIC if WATCHDOG_PRETIMEOUT_GOV_NOOP=n
> +
> if WATCHDOG_PRETIMEOUT_GOV
>
> Can you send v2 with the above, or do you want me to send it and give you credit ?
>
> Thanks,
> Guenter
Hi Guenter,
That's your patch. You can send it. :)
No credit needed.
cheers.
--
~Randy
prev parent reply other threads:[~2019-05-08 0:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-07 23:33 Randy Dunlap
2019-05-08 0:07 ` Guenter Roeck
2019-05-08 0:22 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9fa3055a-a666-021c-6e3e-2d3b6ba4e542@infradead.org \
--to=rdunlap@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=vladimir_zapolskiy@mentor.com \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®