diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-27 07:32:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-27 07:32:09 -0400 |
| commit | 3b589d70cdd0147fb5b5c865a31d63b8f0cd685d (patch) | |
| tree | 0f55783252d3a4a408cdd3b2e2854ae6ae3702ae /arch/m68k/lib/time.c | |
| parent | ff8cb34d79384524ed81027f7d07a31f7405c27d (diff) | |
| parent | 729c1fe656913f0d5b09e986fec9976020a3363c (diff) | |
| download | u-boot-3b589d70cdd0147fb5b5c865a31d63b8f0cd685d.tar.gz u-boot-3b589d70cdd0147fb5b5c865a31d63b8f0cd685d.tar.xz u-boot-3b589d70cdd0147fb5b5c865a31d63b8f0cd685d.zip | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- WDT: Enable use of hw_margin_ms=0
- PowerPC: Introduce CONFIG_CACHE_FLUSH_WATCHDOG_THRESHOLD
- PowerPC: Misc changes and fixes to the WDT handling
Diffstat (limited to 'arch/m68k/lib/time.c')
| -rw-r--r-- | arch/m68k/lib/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index cbe29e72a8..ebb2ac54db 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -71,7 +71,7 @@ void dtimer_interrupt(void *not_used) timestamp++; #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG) - if ((timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) { + if (CONFIG_SYS_WATCHDOG_FREQ && (timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) { WATCHDOG_RESET (); } #endif /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */ |