Merge tag 'linux-watchdog-5.2-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck: - a new watchdog driver for the ROHM BD70528 watchdog block - a new watchdog driver for the i.MX system controller watchdog - conversions to use device managed functions and other improvements - refactor watchdog_init_timeout - make watchdog core configurable as module - pretimeout governors improvements - a lot of other fixes * tag 'linux-watchdog-5.2-rc1' of git://www.linux-watchdog.org/linux-watchdog: (114 commits) watchdog: Enforce that at least one pretimeout governor is enabled watchdog: stm32: add dynamic prescaler support watchdog: Improve Kconfig entry ordering and dependencies watchdog: npcm: Enable modular builds watchdog: Make watchdog core configurable as module watchdog: Move pretimeout governor configuration up watchdog: Use depends instead of select for pretimeout governors watchdog: rtd119x: drop unused module.h include watchdog: intel_scu: make it explicitly non-modular watchdog: coh901327: make it explicitly non-modular watchdog: ziirave_wdt: drop warning after calling watchdog_init_timeout watchdog: xen_wdt: drop warning after calling watchdog_init_timeout watchdog: stm32_iwdg: drop warning after calling watchdog_init_timeout watchdog: st_lpc_wdt: drop warning after calling watchdog_init_timeout watchdog: sp5100_tco: drop warning after calling watchdog_init_timeout watchdog: renesas_wdt: drop warning after calling watchdog_init_timeout watchdog: nic7018_wdt: drop warning after calling watchdog_init_timeout watchdog: ni903x_wdt: drop warning after calling watchdog_init_timeout watchdog: imx_sc_wdt: drop warning after calling watchdog_init_timeout watchdog: i6300esb: drop warning after calling watchdog_init_timeout ...
Šī revīzija ir iekļauta:
@@ -67,7 +67,7 @@ static DEFINE_SPINLOCK(sbwd_lock);
|
||||
*
|
||||
* wdog is the iomem address of the cfg register
|
||||
*/
|
||||
void sbwdog_set(char __iomem *wdog, unsigned long t)
|
||||
static void sbwdog_set(char __iomem *wdog, unsigned long t)
|
||||
{
|
||||
spin_lock(&sbwd_lock);
|
||||
__raw_writeb(0, wdog);
|
||||
@@ -81,7 +81,7 @@ void sbwdog_set(char __iomem *wdog, unsigned long t)
|
||||
*
|
||||
* wdog is the iomem address of the cfg register
|
||||
*/
|
||||
void sbwdog_pet(char __iomem *wdog)
|
||||
static void sbwdog_pet(char __iomem *wdog)
|
||||
{
|
||||
spin_lock(&sbwd_lock);
|
||||
__raw_writeb(__raw_readb(wdog) | 1, wdog);
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user