From: Xu Wang Date: Fri, 6 Mar 2015 08:26:29 +0000 (+0800) Subject: s390/watchdog: enable KEEPALIVE for /dev/watchdog X-Git-Tag: v4.1-rc1~130^2~15 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9ec6cb80c8752db70174d3f67d33243fbab05014;p=karo-tx-linux.git s390/watchdog: enable KEEPALIVE for /dev/watchdog There's no reason why we wouldn't want to be able to send a keep alive message to /dev/watchdog (feed dog) for the s390 diag288 watchdog, so let's enable the WDIOF_KEEPALIVEPING option. Signed-off-by: Xu Wang Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/watchdog/diag288_wdt.c b/drivers/watchdog/diag288_wdt.c index 429494b6c822..480cedd41d09 100644 --- a/drivers/watchdog/diag288_wdt.c +++ b/drivers/watchdog/diag288_wdt.c @@ -202,7 +202,7 @@ static struct watchdog_ops wdt_ops = { }; static struct watchdog_info wdt_info = { - .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE, + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, .firmware_version = 0, .identity = "z Watchdog", };