git: 619fe6570947 - stable/12 - liberate wdog_kern_pat call from SW_WATCHDOG in arm minimdump code
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Jul 2022 11:33:59 UTC
The branch stable/12 has been updated by avg:
URL: https://cgit.FreeBSD.org/src/commit/?id=619fe6570947f8e66467c2b6399aae09707be65a
commit 619fe6570947f8e66467c2b6399aae09707be65a
Author: Andriy Gapon <avg@FreeBSD.org>
AuthorDate: 2022-02-16 07:53:42 +0000
Commit: Andriy Gapon <avg@FreeBSD.org>
CommitDate: 2022-07-04 11:33:23 +0000
liberate wdog_kern_pat call from SW_WATCHDOG in arm minimdump code
Obviosuly, there are hardware watchdogs on arm.
(cherry picked from commit 1a93b2288cb1cf160214272d62dcda2ad76a1f95)
---
sys/arm/arm/minidump_machdep.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c
index f9e3e838104a..1bb322023c71 100644
--- a/sys/arm/arm/minidump_machdep.c
+++ b/sys/arm/arm/minidump_machdep.c
@@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/kerneldump.h>
#include <sys/msgbuf.h>
-#ifdef SW_WATCHDOG
#include <sys/watchdog.h>
-#endif
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/atomic.h>
@@ -136,9 +134,8 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz)
counter &= (1<<22) - 1;
}
-#ifdef SW_WATCHDOG
wdog_kern_pat(WD_LASTVAL);
-#endif
+
if (ptr) {
error = dump_append(di, ptr, 0, len);
if (error)